Commit 191eb398 authored Aug 07, 2014 by Johan Hedberg Committed by Marcel Holtmann Aug 14, 2014

Bluetooth: Remove special handling of ATT in l2cap_security_cfm()



With the update to sk->resume() and __l2cap_no_conn_pending() we
no-longer need to have special handling of ATT channels in the
l2cap_security_cfm() function. The chan->sec_level update when
encryption has been enabled is safe to do for any kind of channel, and
the loop takes later care of calling chan->ready() or chan->resume() if
necessary.

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

parent d52deb17

net/bluetooth/l2cap_core.c

+2 −9

Original line number	Diff line number	Diff line
		@@ -7341,15 +7341,8 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
		continue;
		}

		if (chan->scid == L2CAP_CID_ATT) {
		if (!status && encrypt) {
		if (!status && encrypt)
		chan->sec_level = hcon->sec_level;
		l2cap_chan_ready(chan);
		}

		l2cap_chan_unlock(chan);
		continue;
		}

		if (!__l2cap_no_conn_pending(chan)) {
		l2cap_chan_unlock(chan);