Commit a17de2fe authored May 14, 2013 by Johan Hedberg Committed by Marcel Holtmann Dec 05, 2013

Bluetooth: Allow l2cap_chan_check_security() to be used for LE links.

With connection oriented L2CAP channels some code paths will be shared
with BR/EDR links. It is therefore necessary to allow the
l2cap_chan_check_security function to be usable also for LE links in
addition to BR/EDR ones. This means that smp_conn_security() needs to be
called instead of hci_conn_security() in the case of an LE link.

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

parent bf20fd4e

net/bluetooth/l2cap_core.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -726,6 +726,9 @@ int l2cap_chan_check_security(struct l2cap_chan *chan)
		struct l2cap_conn *conn = chan->conn;
		__u8 auth_type;

		if (conn->hcon->type == LE_LINK)
		return smp_conn_security(conn->hcon, chan->sec_level);

		auth_type = l2cap_get_auth_type(chan);

		return hci_conn_security(conn->hcon, chan->sec_level, auth_type);

Admin message