summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2011-12-22 16:35:05 -0200
committerGustavo F. Padovan <padovan@profusion.mobi>2011-12-22 18:07:01 -0200
commitaf3e6359a2b52970c63c3c9f73d52be281a162ad (patch)
tree304b7466bea89c46e2c9b3bc0b567aacdbe9c07d /net
parentf20d09d5f7093e5dc5f231c65835e2d04739bd5e (diff)
downloadblackbird-op-linux-af3e6359a2b52970c63c3c9f73d52be281a162ad.tar.gz
blackbird-op-linux-af3e6359a2b52970c63c3c9f73d52be281a162ad.zip
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.c4
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,
skb_shinfo(skb)->frag_list = NULL;
/* Queue all fragments atomically */
- spin_lock_bh(&queue->lock);
+ spin_lock(&queue->lock);
__skb_queue_tail(queue, skb);
@@ -1978,7 +1978,7 @@ static void hci_queue_acl(struct hci_conn *conn, struct sk_buff_head *queue,
__skb_queue_tail(queue, skb);
} while (list);
- spin_unlock_bh(&queue->lock);
+ spin_unlock(&queue->lock);
}
}
OpenPOWER on IntegriCloud