Commit 96eff46e authored Nov 15, 2012 by Andrei Emeltchenko Committed by Gustavo Padovan Nov 19, 2012

Bluetooth: Use __l2cap_no_conn_pending helper



Use helper instead of test_bit. This is the only place left using
test CONF_CONNECT_PEND flag.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

parent c1d5dc4a

net/bluetooth/l2cap_core.c

+1 −1

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

	if (test_bit(CONF_CONNECT_PEND, &chan->conf_state)) {		if (!__l2cap_no_conn_pending(chan)) {
	l2cap_chan_unlock(chan);		l2cap_chan_unlock(chan);
	continue;		continue;
	}		}