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

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 <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent bfe4655f

include/net/bluetooth/hci_core.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/bluetooth/hci_conn.c

+6 −8
Original line number Diff line number Diff line
@@ -361,12 +361,12 @@ static void hci_conn_idle(unsigned long arg) 
	hci_conn_enter_sniff_mode(conn);

}



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,

					     auto_accept_work.work);



	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),

		     &conn->dst);

}
@@ -415,9 +415,8 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst) 
	INIT_LIST_HEAD(&conn->chan_list);



	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) 
	del_timer(&conn->idle_timer);



	cancel_delayed_work_sync(&conn->disc_work);



	del_timer(&conn->auto_accept_timer);

	cancel_delayed_work_sync(&conn->auto_accept_work);



	if (conn->type == ACL_LINK) {

		struct hci_conn *sco = conn->link;

net/bluetooth/hci_event.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

		}