summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-11-12 09:17:08 +0200
committerMarcel Holtmann <marcel@holtmann.org>2014-11-12 10:05:25 +0100
commita930430b047a0cc118bfc47ca54fcdfbadf091d2 (patch)
treef34b024966a7c54c7b9f9f49c86b0d2ba6c9d9f0 /net
parentf03567040cbf874834c9e3e52b72fdcb672b9bbb (diff)
downloadlinux-a930430b047a0cc118bfc47ca54fcdfbadf091d2.tar.gz
linux-a930430b047a0cc118bfc47ca54fcdfbadf091d2.tar.bz2
linux-a930430b047a0cc118bfc47ca54fcdfbadf091d2.zip
Bluetooth: Remove unnecessary hci_dev_lock/unlock in smp.c
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>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/smp.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 3ebf65b50881..3d38553eb526 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -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;
}