From: Mat Martineau <mathewm@codeaurora.org>
Date: Fri, 3 Jun 2011 23:21:10 +0000 (-0700)
Subject: Bluetooth: Fix check for the ERTM local busy state
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e694928067b52f569a7df39b7f02efd7b34ab8f4;p=mv-sheeva.git

Bluetooth: Fix check for the ERTM local busy state

Local busy is encoded in a bitfield, but was not masked out correctly.

Signed-off-by: Mat Martineau <mathewm@codeaurora.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
---

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index e3b86fc3ba9..dff9d76fe79 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -3540,7 +3540,7 @@ static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_cont
 		goto drop;
 	}
 
-	if (chan->conn_state == L2CAP_CONN_LOCAL_BUSY)
+	if (chan->conn_state & L2CAP_CONN_LOCAL_BUSY)
 		goto drop;
 
 	if (chan->conn_state & L2CAP_CONN_SREJ_SENT) {