From: Johan Hedberg Date: Wed, 21 Oct 2015 15:03:07 +0000 (+0300) Subject: Bluetooth: Remove redundant (and possibly wrong) flag clearing X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1ede9868f6577e2bd7eda1a05cd6812aff5c6c8a;p=openwrt%2Fstaging%2Fblogic.git Bluetooth: Remove redundant (and possibly wrong) flag clearing There's no need to clear the HCI_CONN_ENCRYPT_PEND flag in smp_failure. In fact, this may cause the encryption tracking to get out of sync as this has nothing to do with HCI activity. Signed-off-by: Johan Hedberg Signed-off-by: Marcel Holtmann --- diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index 229d88eebf4e..94f9c4ca68f1 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -811,7 +811,6 @@ static void smp_failure(struct l2cap_conn *conn, u8 reason) smp_send_cmd(conn, SMP_CMD_PAIRING_FAIL, sizeof(reason), &reason); - clear_bit(HCI_CONN_ENCRYPT_PEND, &hcon->flags); mgmt_auth_failed(hcon, HCI_ERROR_AUTH_FAILURE); if (chan->data)