summaryrefslogtreecommitdiffstats
path: root/include/net/bluetooth/l2cap.h
diff options
context:
space:
mode:
authorMarcel Holtmann2014-07-13 20:50:15 +0200
committerJohan Hedberg2014-07-13 21:32:45 +0200
commit5a54e7c85b8303b84a9b2fbf978a74d625f85a99 (patch)
tree2645770a8ce89f7d70ebf30eba3358f41ab39993 /include/net/bluetooth/l2cap.h
parentBluetooth: Remove unneeded forward declaration of sco_chan_del (diff)
downloadkernel-qcow2-linux-5a54e7c85b8303b84a9b2fbf978a74d625f85a99.tar.gz
kernel-qcow2-linux-5a54e7c85b8303b84a9b2fbf978a74d625f85a99.tar.xz
kernel-qcow2-linux-5a54e7c85b8303b84a9b2fbf978a74d625f85a99.zip
Bluetooth: Convert L2CAP ident spinlock into a mutex
The spinlock protecting the L2CAP ident number can be converted into a mutex since the whole processing is run in a workqueue. So instead of using a spinlock, just use a mutex here. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'include/net/bluetooth/l2cap.h')
-rw-r--r--include/net/bluetooth/l2cap.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index d8e7b9330ab8..1fffd92808b0 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -625,11 +625,10 @@ struct l2cap_conn {
struct delayed_work info_timer;
- spinlock_t lock;
-
struct sk_buff *rx_skb;
__u32 rx_len;
__u8 tx_ident;
+ struct mutex ident_lock;
struct sk_buff_head pending_rx;
struct work_struct pending_rx_work;