aboutsummaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2011-12-20 10:57:27 -0200
committerGustavo F. Padovan <padovan@profusion.mobi>2011-12-20 17:07:03 -0200
commit6c9d42a1615c6dc19c4a57a77d9c4b3d779bb741 (patch)
tree27c2c72dd631c05de40684535d2028441e2d792e /include/net
parentc2ec9c1bbd17cdd1fc962f000b4ecb98c1dad830 (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')
-rw-r--r--include/net/bluetooth/l2cap.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index e199c2f0e4d..fc481d1ebf0 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -532,7 +532,7 @@ struct l2cap_conn {
__u8 disc_reason;
- struct timer_list security_timer;
+ struct delayed_work security_timer;
struct smp_chan *smp_chan;
struct list_head chan_l;