diff options
| author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2012-11-15 18:14:53 +0200 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-11-19 19:24:45 -0200 |
| commit | 96eff46e9f5632efa0d2941f7e028701a5f1a0f6 (patch) | |
| tree | f5d7604239ee81bb35f41a84494d5adfaf864d54 /net/bluetooth | |
| parent | c1d5dc4ac15be45c7061e207f06ad8dfba0c2170 (diff) | |
| download | linux-3.10-96eff46e9f5632efa0d2941f7e028701a5f1a0f6.tar.gz linux-3.10-96eff46e9f5632efa0d2941f7e028701a5f1a0f6.tar.bz2 linux-3.10-96eff46e9f5632efa0d2941f7e028701a5f1a0f6.zip | |
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>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index a1faaab4183..4479894e0a5 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -6380,7 +6380,7 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt) continue; } - if (test_bit(CONF_CONNECT_PEND, &chan->conf_state)) { + if (!__l2cap_no_conn_pending(chan)) { l2cap_chan_unlock(chan); continue; } |