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-Tag: firefly_0821_release~7613^2~515
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f78088ad4f8d5746bd52baf0038facb2cb761d69;p=firefly-linux-kernel-4.4.55.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 f67dc2a6a578..851d0351ca35 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -3541,7 +3541,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) {