aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2013-04-29 12:35:39 -0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-06-22 19:23:48 -0400
commitd8729922b474eab65ca738028a2e69fb12e2eaa6 (patch)
treee5268feb95d8e84fac7ee0cb1043d53ff987b1b2 /net
parent9f22398ce4baf816535415e65949d03f55a7973a (diff)
Bluetooth: Add clarifying comment to l2cap_conn_ready()
There is an extra call to smp_conn_security() for outgoing LE connections from l2cap_conn_ready() but the reason for this call is far from clear. After a bit of commit history research and using git blame I found out that this extra call is for socket-less pairing processes added by commit 160dc6ac1. This patch adds a clarifying comment to the code for this. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/l2cap_core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 4803610187ed..417d17723ee9 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1387,6 +1387,9 @@ static void l2cap_conn_ready(struct l2cap_conn *conn)
1387 if (!hcon->out && hcon->type == LE_LINK) 1387 if (!hcon->out && hcon->type == LE_LINK)
1388 l2cap_le_conn_ready(conn); 1388 l2cap_le_conn_ready(conn);
1389 1389
1390 /* For outgoing pairing which doesn't necessarily have an
1391 * associated socket (e.g. mgmt_pair_device).
1392 */
1390 if (hcon->out && hcon->type == LE_LINK) 1393 if (hcon->out && hcon->type == LE_LINK)
1391 smp_conn_security(hcon, hcon->pending_sec_level); 1394 smp_conn_security(hcon, hcon->pending_sec_level);
1392 1395