summaryrefslogtreecommitdiff
path: root/net/bluetooth/l2cap_core.c
diff options
context:
space:
mode:
authorMat Martineau <mathewm@codeaurora.org>2011-06-03 16:21:10 -0700
committerJaikumar Ganesh <jaikumar@google.com>2011-07-11 11:59:18 -0700
commitf78088ad4f8d5746bd52baf0038facb2cb761d69 (patch)
treee3ffd683062513690cb9a2fabea9cb16dbd96ec6 /net/bluetooth/l2cap_core.c
parent5125e9e81028c431a5f66ba0b02604a00c56750e (diff)
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>
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
-rw-r--r--net/bluetooth/l2cap_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index f67dc2a6a57..851d0351ca3 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) {