diff options
| author |   Johan Hedberg <johan.hedberg@intel.com> | 2015-10-21 18:03:07 +0300 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2015-10-21 18:57:03 +0200 |
| commit | 1ede9868f6577e2bd7eda1a05cd6812aff5c6c8a (patch) | |
| tree | de2162dc01468fac73521fe42f81c5b067565551 /net/bluetooth/smp.c | |
| parent | Bluetooth: Add hdev helper variable to hci_le_create_connection_cancel (diff) | |
| download | linux-dev-1ede9868f6577e2bd7eda1a05cd6812aff5c6c8a.tar.xz linux-dev-1ede9868f6577e2bd7eda1a05cd6812aff5c6c8a.zip | |
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 <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 | 1 |
1 files changed, 0 insertions, 1 deletions
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) |