---

yaml --- r: 255715 b: refs/heads/master c: e694928 h: refs/heads/master i: 255713: 1e1c56e 255711: 8764de6 v: v3
git-mirror · Jun 8, 2011 · 25b60db · 25b60db
1 parent 7ebd1e4
commit 25b60db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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) {