]> git.karo-electronics.de Git - linux-beck.git/commit
Bluetooth: Convert SMP to use l2cap_chan infrastructure
authorJohan Hedberg <johan.hedberg@intel.com>
Fri, 8 Aug 2014 06:37:18 +0000 (09:37 +0300)
committerMarcel Holtmann <marcel@holtmann.org>
Thu, 14 Aug 2014 06:49:19 +0000 (08:49 +0200)
commit5d88cc73dded31a93fcc4821f33a8c3d755bf454
treec6599506929f335c954e40b2fbcf13dc7af98a88
parentdefce9e83666658d4420d65e45ab1ad190992f72
Bluetooth: Convert SMP to use l2cap_chan infrastructure

Now that we have all the necessary pieces in place we can fully convert
SMP to use the L2CAP channel infrastructure. This patch adds the
necessary callbacks and removes the now unneeded conn->smp_chan pointer.

One notable behavioral change in this patch comes from the following
code snippet:

-       case L2CAP_CID_SMP:
-               if (smp_sig_channel(conn, skb))
-                       l2cap_conn_del(conn->hcon, EACCES);

This piece of code was essentially forcing a disconnection if garbage
SMP data was received. The l2cap_conn_del() function is private to
l2cap_conn.c so we don't have access to it anymore when using the L2CAP
channel callbacks. Therefore, the behavior of the new code is simply to
return errors in the recv() callback (which is simply the old
smp_sig_channel()), but no disconnection will occur.

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