diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2013-10-16 18:11:39 +0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2013-10-16 09:12:12 -0700 |
| commit | 7bc18d9d3d7ffbc09dabb201933a063583a39027 (patch) | |
| tree | 3d72b9a4fce174e064c852d5a44100a988c3308e /net/bluetooth/hci_event.c | |
| parent | bfe4655f05d7ec4a7c0c1c7e4051862f824cd8ec (diff) | |
| download | linux-7bc18d9d3d7ffbc09dabb201933a063583a39027.tar.bz2 | |
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 'net/bluetooth/hci_event.c')
| -rw-r--r-- | net/bluetooth/hci_event.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index e71c98fedc9b..6c3b193951ad 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -3188,7 +3188,8 @@ static void hci_user_confirm_request_evt(struct hci_dev *hdev, if (hdev->auto_accept_delay > 0) { int delay = msecs_to_jiffies(hdev->auto_accept_delay); - mod_timer(&conn->auto_accept_timer, jiffies + delay); + queue_delayed_work(conn->hdev->workqueue, + &conn->auto_accept_work, delay); goto unlock; } |