diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2014-08-08 02:28:05 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-08-14 02:49:16 -0400 |
commit | d3368605591b88cd8af522adadb1c460a8f8e7bb (patch) | |
tree | 7b6fa2048b0b9fcec169f0c7d1fe209676ce7e69 /net/bluetooth/smp.c | |
parent | 79a0572736ad4b9cac7be72d4402f9c79db8ebaf (diff) |
Bluetooth: Fix using HCI_CONN_LE_SMP_PEND to check for SMP context
The code is consistently using the HCI_CONN_LE_SMP_PEND flag check for
the existence of the SMP context, with the exception of this one place
in smp_sig_channel(). This patch converts the place to use the flag just
like all other instances.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/smp.c')
-rw-r--r-- | net/bluetooth/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index 40db728f044b..33016ec9b247 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c | |||
@@ -1206,7 +1206,7 @@ int smp_sig_channel(struct l2cap_conn *conn, struct sk_buff *skb) | |||
1206 | * returns an error). | 1206 | * returns an error). |
1207 | */ | 1207 | */ |
1208 | if (code != SMP_CMD_PAIRING_REQ && code != SMP_CMD_SECURITY_REQ && | 1208 | if (code != SMP_CMD_PAIRING_REQ && code != SMP_CMD_SECURITY_REQ && |
1209 | !conn->smp_chan) { | 1209 | !test_bit(HCI_CONN_LE_SMP_PEND, &hcon->flags)) { |
1210 | BT_ERR("Unexpected SMP command 0x%02x. Disconnecting.", code); | 1210 | BT_ERR("Unexpected SMP command 0x%02x. Disconnecting.", code); |
1211 | kfree_skb(skb); | 1211 | kfree_skb(skb); |
1212 | return -EOPNOTSUPP; | 1212 | return -EOPNOTSUPP; |