OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Johan Hedberg 2014-09-05 22:19:48 +03:00 committed by Marcel Holtmann
parent 434714dc02
commit 1b0921d6be
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/bluetooth/smp.c
View File

@ -282,8 +282,7 @@ static void smp_send_cmd(struct l2cap_conn *conn, u8 code, u16 len, void *data)
smp = chan->data;
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)
@ -375,9 +374,6 @@ static void smp_chan_destroy(struct l2cap_conn *conn)
BUG_ON(!smp);
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)) {
cancel_work_sync(&smp->distribute_work);