The following commit has been merged in the batman-adv/next branch: commit ee72d150ada90d33cc6e222fbdd7f980c16d974d Author: Andre Guedes andre.guedes@openbossa.org Date: Mon Jul 23 18:19:04 2012 -0300

Bluetooth: Remove locking in hci_user_passkey_request_evt

This patch removes hdev locking in hci_user_passkey_request_evt since it is not needed. mgmt_user_passkey_request simply calls mgmt_event which does not require hdev locking at all.

Signed-off-by: Andre Guedes andre.guedes@openbossa.org Signed-off-by: Gustavo Padovan gustavo.padovan@collabora.co.uk

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 2d8761b..0386e1e 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -3252,12 +3252,8 @@ static void hci_user_passkey_request_evt(struct hci_dev *hdev,

BT_DBG("%s", hdev->name);

- hci_dev_lock(hdev); - if (test_bit(HCI_MGMT, &hdev->dev_flags)) mgmt_user_passkey_request(hdev, &ev->bdaddr, ACL_LINK, 0); - - hci_dev_unlock(hdev); }

static void hci_simple_pair_complete_evt(struct hci_dev *hdev,