Commit 1b0921d6 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann

Bluetooth: Remove unnecessary checks after canceling SMP security timer

The SMP security timer used to be able to modify the SMP context state
but now days it simply calls hci_disconnect(). It is therefore
unnecessary to have extra sanity checks for the SMP context after
canceling the timer.
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 434714dc
...@@ -282,8 +282,7 @@ static void smp_send_cmd(struct l2cap_conn *conn, u8 code, u16 len, void *data) ...@@ -282,8 +282,7 @@ static void smp_send_cmd(struct l2cap_conn *conn, u8 code, u16 len, void *data)
smp = chan->data; smp = chan->data;
cancel_delayed_work_sync(&smp->security_timer); cancel_delayed_work_sync(&smp->security_timer);
if (test_bit(HCI_CONN_LE_SMP_PEND, &conn->hcon->flags)) schedule_delayed_work(&smp->security_timer, SMP_TIMEOUT);
schedule_delayed_work(&smp->security_timer, SMP_TIMEOUT);
} }
static __u8 authreq_to_seclevel(__u8 authreq) static __u8 authreq_to_seclevel(__u8 authreq)
...@@ -375,9 +374,6 @@ static void smp_chan_destroy(struct l2cap_conn *conn) ...@@ -375,9 +374,6 @@ static void smp_chan_destroy(struct l2cap_conn *conn)
BUG_ON(!smp); BUG_ON(!smp);
cancel_delayed_work_sync(&smp->security_timer); cancel_delayed_work_sync(&smp->security_timer);
/* In case the timeout freed the SMP context */
if (!chan->data)
return;
if (work_pending(&smp->distribute_work)) { if (work_pending(&smp->distribute_work)) {
cancel_work_sync(&smp->distribute_work); cancel_work_sync(&smp->distribute_work);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment