Commit 6c9d42a1 authored by Gustavo F. Padovan's avatar Gustavo F. Padovan

Bluetooth: convert security timer to delayed_work

This one also needs to run in process context
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent c2ec9c1b
...@@ -532,7 +532,7 @@ struct l2cap_conn { ...@@ -532,7 +532,7 @@ struct l2cap_conn {
__u8 disc_reason; __u8 disc_reason;
struct timer_list security_timer; struct delayed_work security_timer;
struct smp_chan *smp_chan; struct smp_chan *smp_chan;
struct list_head chan_l; struct list_head chan_l;
......
...@@ -1032,7 +1032,7 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err) ...@@ -1032,7 +1032,7 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)
cancel_delayed_work_sync(&conn->info_work); cancel_delayed_work_sync(&conn->info_work);
if (test_and_clear_bit(HCI_CONN_LE_SMP_PEND, &hcon->pend)) { if (test_and_clear_bit(HCI_CONN_LE_SMP_PEND, &hcon->pend)) {
del_timer(&conn->security_timer); cancel_delayed_work_sync(&conn->security_timer);
smp_chan_destroy(conn); smp_chan_destroy(conn);
} }
...@@ -1040,9 +1040,10 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err) ...@@ -1040,9 +1040,10 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)
kfree(conn); kfree(conn);
} }
static void security_timeout(unsigned long arg) static void security_timeout(struct work_struct *work)
{ {
struct l2cap_conn *conn = (void *) arg; struct l2cap_conn *conn = container_of(work, struct l2cap_conn,
security_timer.work);
l2cap_conn_del(conn->hcon, ETIMEDOUT); l2cap_conn_del(conn->hcon, ETIMEDOUT);
} }
...@@ -1086,8 +1087,7 @@ static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon, u8 status) ...@@ -1086,8 +1087,7 @@ static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon, u8 status)
INIT_LIST_HEAD(&conn->chan_l); INIT_LIST_HEAD(&conn->chan_l);
if (hcon->type == LE_LINK) if (hcon->type == LE_LINK)
setup_timer(&conn->security_timer, security_timeout, INIT_DELAYED_WORK(&conn->security_timer, security_timeout);
(unsigned long) conn);
else else
INIT_DELAYED_WORK(&conn->info_work, l2cap_info_timeout); INIT_DELAYED_WORK(&conn->info_work, l2cap_info_timeout);
...@@ -4519,7 +4519,7 @@ static int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt) ...@@ -4519,7 +4519,7 @@ static int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
if (hcon->type == LE_LINK) { if (hcon->type == LE_LINK) {
smp_distribute_keys(conn, 0); smp_distribute_keys(conn, 0);
del_timer(&conn->security_timer); cancel_delayed_work_sync(&conn->security_timer);
} }
rcu_read_lock(); rcu_read_lock();
......
...@@ -184,7 +184,8 @@ static void smp_send_cmd(struct l2cap_conn *conn, u8 code, u16 len, void *data) ...@@ -184,7 +184,8 @@ static void smp_send_cmd(struct l2cap_conn *conn, u8 code, u16 len, void *data)
skb->priority = HCI_PRIO_MAX; skb->priority = HCI_PRIO_MAX;
hci_send_acl(conn->hchan, skb, 0); hci_send_acl(conn->hchan, skb, 0);
mod_timer(&conn->security_timer, jiffies + cancel_delayed_work_sync(&conn->security_timer);
schedule_delayed_work(&conn->security_timer,
msecs_to_jiffies(SMP_TIMEOUT)); msecs_to_jiffies(SMP_TIMEOUT));
} }
...@@ -240,7 +241,7 @@ static void smp_failure(struct l2cap_conn *conn, u8 reason, u8 send) ...@@ -240,7 +241,7 @@ static void smp_failure(struct l2cap_conn *conn, u8 reason, u8 send)
clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->hcon->pend); clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->hcon->pend);
mgmt_auth_failed(conn->hcon->hdev, conn->dst, reason); mgmt_auth_failed(conn->hcon->hdev, conn->dst, reason);
del_timer(&conn->security_timer); cancel_delayed_work_sync(&conn->security_timer);
smp_chan_destroy(conn); smp_chan_destroy(conn);
} }
...@@ -800,7 +801,7 @@ int smp_distribute_keys(struct l2cap_conn *conn, __u8 force) ...@@ -800,7 +801,7 @@ int smp_distribute_keys(struct l2cap_conn *conn, __u8 force)
if (conn->hcon->out || force) { if (conn->hcon->out || force) {
clear_bit(HCI_CONN_LE_SMP_PEND, &conn->hcon->pend); clear_bit(HCI_CONN_LE_SMP_PEND, &conn->hcon->pend);
del_timer(&conn->security_timer); cancel_delayed_work_sync(&conn->security_timer);
smp_chan_destroy(conn); smp_chan_destroy(conn);
} }
......
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