Commit 7bc18d9d authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann

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: default avatarJohan Hedberg <>
Signed-off-by: default avatarMarcel Holtmann <>
parent bfe4655f
......@@ -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;
......@@ -361,12 +361,12 @@ static void hci_conn_idle(unsigned long arg)
static void hci_conn_auto_accept(unsigned long arg)
static void hci_conn_auto_accept(struct work_struct *work)
struct hci_conn *conn = (void *) arg;
struct hci_dev *hdev = conn->hdev;
struct hci_conn *conn = container_of(work, struct hci_conn,;
hci_send_cmd(hdev, HCI_OP_USER_CONFIRM_REPLY, sizeof(conn->dst),
hci_send_cmd(conn->hdev, HCI_OP_USER_CONFIRM_REPLY, sizeof(conn->dst),
......@@ -415,9 +415,8 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst)
INIT_DELAYED_WORK(&conn->disc_work, hci_conn_timeout);
INIT_DELAYED_WORK(&conn->auto_accept_work, hci_conn_auto_accept);
setup_timer(&conn->idle_timer, hci_conn_idle, (unsigned long)conn);
setup_timer(&conn->auto_accept_timer, hci_conn_auto_accept,
(unsigned long) conn);
atomic_set(&conn->refcnt, 0);
......@@ -441,8 +440,7 @@ int hci_conn_del(struct hci_conn *conn)
if (conn->type == ACL_LINK) {
struct hci_conn *sco = conn->link;
......@@ -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);
&conn->auto_accept_work, delay);
goto unlock;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment