diff options
author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-20 07:57:27 -0500 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-20 14:07:03 -0500 |
commit | 6c9d42a1615c6dc19c4a57a77d9c4b3d779bb741 (patch) | |
tree | 27c2c72dd631c05de40684535d2028441e2d792e /include/net/bluetooth | |
parent | c2ec9c1bbd17cdd1fc962f000b4ecb98c1dad830 (diff) |
Bluetooth: convert security timer to delayed_work
This one also needs to run in process context
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'include/net/bluetooth')
-rw-r--r-- | include/net/bluetooth/l2cap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index e199c2f0e4dc..fc481d1ebf0b 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h | |||
@@ -532,7 +532,7 @@ struct l2cap_conn { | |||
532 | 532 | ||
533 | __u8 disc_reason; | 533 | __u8 disc_reason; |
534 | 534 | ||
535 | struct timer_list security_timer; | 535 | struct delayed_work security_timer; |
536 | struct smp_chan *smp_chan; | 536 | struct smp_chan *smp_chan; |
537 | 537 | ||
538 | struct list_head chan_l; | 538 | struct list_head chan_l; |