From: Johan Hedberg Date: Fri, 8 Aug 2014 06:28:05 +0000 (+0300) Subject: Bluetooth: Fix using HCI_CONN_LE_SMP_PEND to check for SMP context X-Git-Tag: v3.18-rc1~52^2~133^2~84^2~31 X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;ds=sidebyside;h=d3368605591b88cd8af522adadb1c460a8f8e7bb;p=cascardo%2Flinux.git 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 Signed-off-by: Marcel Holtmann --- 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) * returns an error). */ if (code != SMP_CMD_PAIRING_REQ && code != SMP_CMD_SECURITY_REQ && - !conn->smp_chan) { + !test_bit(HCI_CONN_LE_SMP_PEND, &hcon->flags)) { BT_ERR("Unexpected SMP command 0x%02x. Disconnecting.", code); kfree_skb(skb); return -EOPNOTSUPP;