diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2013-10-16 18:11:40 +0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2013-10-16 09:12:13 -0700 |
| commit | a74a84f696537f38fa994c1b95a0dca9ae386865 (patch) | |
| tree | 0d6ac825ac9843576b9e0dc3ba55c76219438cae /include/net | |
| parent | 7bc18d9d3d7ffbc09dabb201933a063583a39027 (diff) | |
| download | linux-a74a84f696537f38fa994c1b95a0dca9ae386865.tar.gz linux-a74a84f696537f38fa994c1b95a0dca9ae386865.tar.bz2 linux-a74a84f696537f38fa994c1b95a0dca9ae386865.zip | |
Bluetooth: Convert idle timer to use delayed work
There is no need to use a timer since the entire Bluetooth subsystem
runs using workqueues these days.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 2504a2553baa..07c2da4854ab 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -342,7 +342,7 @@ struct hci_conn { struct delayed_work disc_work; struct delayed_work auto_accept_work; - struct timer_list idle_timer; + struct delayed_work idle_work; struct device dev; @@ -651,7 +651,7 @@ static inline void hci_conn_drop(struct hci_conn *conn) switch (conn->type) { case ACL_LINK: case LE_LINK: - del_timer(&conn->idle_timer); + cancel_delayed_work(&conn->idle_work); if (conn->state == BT_CONNECTED) { timeo = conn->disc_timeout; if (!conn->out) |