diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2013-10-16 11:11:39 -0400 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2013-10-16 12:12:12 -0400 |
| commit | 7bc18d9d3d7ffbc09dabb201933a063583a39027 (patch) | |
| tree | 3d72b9a4fce174e064c852d5a44100a988c3308e /include | |
| parent | bfe4655f05d7ec4a7c0c1c7e4051862f824cd8ec (diff) | |
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')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 2 |
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 { | |||
| 341 | struct list_head chan_list; | 341 | struct list_head chan_list; |
| 342 | 342 | ||
| 343 | struct delayed_work disc_work; | 343 | struct delayed_work disc_work; |
| 344 | struct delayed_work auto_accept_work; | ||
| 344 | struct timer_list idle_timer; | 345 | struct timer_list idle_timer; |
| 345 | struct timer_list auto_accept_timer; | ||
| 346 | 346 | ||
| 347 | struct device dev; | 347 | struct device dev; |
| 348 | 348 | ||
