diff options
author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-22 13:35:05 -0500 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-22 15:07:01 -0500 |
commit | af3e6359a2b52970c63c3c9f73d52be281a162ad (patch) | |
tree | 304b7466bea89c46e2c9b3bc0b567aacdbe9c07d /net | |
parent | f20d09d5f7093e5dc5f231c65835e2d04739bd5e (diff) |
Bluetooth: Don't disable interrupt when locking the queue
We run everything in process context now.
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/hci_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 4f0ff01dc680..6d38d80195cb 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -1960,7 +1960,7 @@ static void hci_queue_acl(struct hci_conn *conn, struct sk_buff_head *queue, | |||
1960 | skb_shinfo(skb)->frag_list = NULL; | 1960 | skb_shinfo(skb)->frag_list = NULL; |
1961 | 1961 | ||
1962 | /* Queue all fragments atomically */ | 1962 | /* Queue all fragments atomically */ |
1963 | spin_lock_bh(&queue->lock); | 1963 | spin_lock(&queue->lock); |
1964 | 1964 | ||
1965 | __skb_queue_tail(queue, skb); | 1965 | __skb_queue_tail(queue, skb); |
1966 | 1966 | ||
@@ -1978,7 +1978,7 @@ static void hci_queue_acl(struct hci_conn *conn, struct sk_buff_head *queue, | |||
1978 | __skb_queue_tail(queue, skb); | 1978 | __skb_queue_tail(queue, skb); |
1979 | } while (list); | 1979 | } while (list); |
1980 | 1980 | ||
1981 | spin_unlock_bh(&queue->lock); | 1981 | spin_unlock(&queue->lock); |
1982 | } | 1982 | } |
1983 | } | 1983 | } |
1984 | 1984 | ||