From 25b60db2317ff656c4244e6d78db33bd133bc5ba Mon Sep 17 00:00:00 2001
From: Mat Martineau <mathewm@codeaurora.org>
Date: Fri, 3 Jun 2011 16:21:10 -0700
Subject: [PATCH] --- yaml --- r: 255715 b: refs/heads/master c:
 e694928067b52f569a7df39b7f02efd7b34ab8f4 h: refs/heads/master i:   255713:
 1e1c56e81ce24ca92df5e4af7e870eb541742e96   255711:
 8764de69cd80993a349a6941fed6d07cda308b87 v: v3

---
 [refs]                           | 2 +-
 trunk/net/bluetooth/l2cap_core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a71975762cb6..3f0354f5897a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8d69c54fb8fbb7483180b609f99f2e3e539962b
+refs/heads/master: e694928067b52f569a7df39b7f02efd7b34ab8f4
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c
index e3b86fc3ba9a..dff9d76fe790 100644
--- a/trunk/net/bluetooth/l2cap_core.c
+++ b/trunk/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) {