summaryrefslogtreecommitdiff
path: root/include/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2013-10-16 19:11:39 +0400
committerMarcel Holtmann <marcel@holtmann.org>2013-10-16 20:12:12 +0400
commit7bc18d9d3d7ffbc09dabb201933a063583a39027 (patch)
tree3d72b9a4fce174e064c852d5a44100a988c3308e /include/net/bluetooth
parentbfe4655f05d7ec4a7c0c1c7e4051862f824cd8ec (diff)
downloadlinux-7bc18d9d3d7ffbc09dabb201933a063583a39027.tar.xz
Bluetooth: Convert auto accept timer to use delayed work
Since the entire Bluetooth subsystem runs in workqueues these days there is no need to use a timer for deferring work. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'include/net/bluetooth')
-rw-r--r--include/net/bluetooth/hci_core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index d987c795ba14..2504a2553baa 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -341,8 +341,8 @@ struct hci_conn {
struct list_head chan_list;
struct delayed_work disc_work;
+ struct delayed_work auto_accept_work;
struct timer_list idle_timer;
- struct timer_list auto_accept_timer;
struct device dev;