Bluetooth: Remove unnecessary hci_dev_lock/unlock in smp.c
authorJohan Hedberg <johan.hedberg@intel.com>
Wed, 12 Nov 2014 07:17:08 +0000 (09:17 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Wed, 12 Nov 2014 09:05:25 +0000 (10:05 +0100)
The mgmt_user_passkey_request and related functions do not do anything
else except read access to hdev->id. This member never changes after the
hdev creation so there is no need to acquire a lock to read it.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/smp.c

index 3ebf65b508813b57c42ec3c2b4f75c1b97e9122d..3d38553eb526e6a73fbdeec29569e7f55912cf5a 100644 (file)
@@ -514,8 +514,6 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,
                set_bit(SMP_FLAG_TK_VALID, &smp->flags);
        }
 
-       hci_dev_lock(hcon->hdev);
-
        if (method == REQ_PASSKEY)
                ret = mgmt_user_passkey_request(hcon->hdev, &hcon->dst,
                                                hcon->type, hcon->dst_type);
@@ -528,8 +526,6 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,
                                                hcon->type, hcon->dst_type,
                                                passkey, 0);
 
-       hci_dev_unlock(hcon->hdev);
-
        return ret;
 }