Commit 67d0dfb5 authored by Gustavo F. Padovan's avatar Gustavo F. Padovan

Bluetooth: move hci_task_lock to mutex

Now we can sleep in any path inside Bluetooth core, so mutex can make
sense here.
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent eb403a1b
...@@ -60,7 +60,7 @@ static void hci_rx_work(struct work_struct *work); ...@@ -60,7 +60,7 @@ static void hci_rx_work(struct work_struct *work);
static void hci_cmd_task(unsigned long arg); static void hci_cmd_task(unsigned long arg);
static void hci_tx_task(unsigned long arg); static void hci_tx_task(unsigned long arg);
static DEFINE_RWLOCK(hci_task_lock); static DEFINE_MUTEX(hci_task_lock);
/* HCI device list */ /* HCI device list */
LIST_HEAD(hci_dev_list); LIST_HEAD(hci_dev_list);
...@@ -1808,14 +1808,14 @@ int hci_register_proto(struct hci_proto *hp) ...@@ -1808,14 +1808,14 @@ int hci_register_proto(struct hci_proto *hp)
if (hp->id >= HCI_MAX_PROTO) if (hp->id >= HCI_MAX_PROTO)
return -EINVAL; return -EINVAL;
write_lock_bh(&hci_task_lock); mutex_lock(&hci_task_lock);
if (!hci_proto[hp->id]) if (!hci_proto[hp->id])
hci_proto[hp->id] = hp; hci_proto[hp->id] = hp;
else else
err = -EEXIST; err = -EEXIST;
write_unlock_bh(&hci_task_lock); mutex_unlock(&hci_task_lock);
return err; return err;
} }
...@@ -1830,14 +1830,14 @@ int hci_unregister_proto(struct hci_proto *hp) ...@@ -1830,14 +1830,14 @@ int hci_unregister_proto(struct hci_proto *hp)
if (hp->id >= HCI_MAX_PROTO) if (hp->id >= HCI_MAX_PROTO)
return -EINVAL; return -EINVAL;
write_lock_bh(&hci_task_lock); mutex_lock(&hci_task_lock);
if (hci_proto[hp->id]) if (hci_proto[hp->id])
hci_proto[hp->id] = NULL; hci_proto[hp->id] = NULL;
else else
err = -ENOENT; err = -ENOENT;
write_unlock_bh(&hci_task_lock); mutex_unlock(&hci_task_lock);
return err; return err;
} }
...@@ -2386,7 +2386,7 @@ static void hci_tx_task(unsigned long arg) ...@@ -2386,7 +2386,7 @@ static void hci_tx_task(unsigned long arg)
struct hci_dev *hdev = (struct hci_dev *) arg; struct hci_dev *hdev = (struct hci_dev *) arg;
struct sk_buff *skb; struct sk_buff *skb;
read_lock(&hci_task_lock); mutex_lock(&hci_task_lock);
BT_DBG("%s acl %d sco %d le %d", hdev->name, hdev->acl_cnt, BT_DBG("%s acl %d sco %d le %d", hdev->name, hdev->acl_cnt,
hdev->sco_cnt, hdev->le_cnt); hdev->sco_cnt, hdev->le_cnt);
...@@ -2405,7 +2405,7 @@ static void hci_tx_task(unsigned long arg) ...@@ -2405,7 +2405,7 @@ static void hci_tx_task(unsigned long arg)
while ((skb = skb_dequeue(&hdev->raw_q))) while ((skb = skb_dequeue(&hdev->raw_q)))
hci_send_frame(skb); hci_send_frame(skb);
read_unlock(&hci_task_lock); mutex_unlock(&hci_task_lock);
} }
/* ----- HCI RX task (incoming data processing) ----- */ /* ----- HCI RX task (incoming data processing) ----- */
...@@ -2493,7 +2493,7 @@ static void hci_rx_work(struct work_struct *work) ...@@ -2493,7 +2493,7 @@ static void hci_rx_work(struct work_struct *work)
BT_DBG("%s", hdev->name); BT_DBG("%s", hdev->name);
read_lock(&hci_task_lock); mutex_lock(&hci_task_lock);
while ((skb = skb_dequeue(&hdev->rx_q))) { while ((skb = skb_dequeue(&hdev->rx_q))) {
if (atomic_read(&hdev->promisc)) { if (atomic_read(&hdev->promisc)) {
...@@ -2539,7 +2539,7 @@ static void hci_rx_work(struct work_struct *work) ...@@ -2539,7 +2539,7 @@ static void hci_rx_work(struct work_struct *work)
} }
} }
read_unlock(&hci_task_lock); mutex_unlock(&hci_task_lock);
} }
static void hci_cmd_task(unsigned long arg) static void hci_cmd_task(unsigned long arg)
......
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