summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2014-06-16 14:30:56 +0400
committerMarcel Holtmann <marcel@holtmann.org>2014-07-03 19:42:42 +0400
commit65cc2b49db63adf1455a9783234383fbec5b8314 (patch)
tree880d1d7ae9174088692e8f4d694a265af2a9e570 /include
parentd9fbd02be5c201c1659ee0d79c0820bb68d95c8c (diff)
downloadlinux-65cc2b49db63adf1455a9783234383fbec5b8314.tar.xz
Bluetooth: Use struct delayed_work for HCI command timeout
Since the whole HCI command, event and data packet processing has been migrated to use workqueues instead of tasklets, it makes sense to use struct delayed_work instead of struct timer_list for the timeout handling. This patch converts the hdev->cmd_timer to use workqueue as well. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'include')
-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 b386bf17e6c2..de3bb22e83f9 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -273,7 +273,7 @@ struct hci_dev {
struct delayed_work service_cache;
- struct timer_list cmd_timer;
+ struct delayed_work cmd_timer;
struct work_struct rx_work;
struct work_struct cmd_work;