---

yaml --- r: 203825 b: refs/heads/master c: bc1b1f8 h: refs/heads/master i: 203823: 0f40ff3 v: v3
git-mirror · Jul 21, 2010 · 2edbec1 · 2edbec1
1 parent 0909b43
commit 2edbec1
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: 8ff50ec04a7ecdbba6e0a5423cf6f2c5f7fc605e
+refs/heads/master: bc1b1f8bee63966649dd5ac7d10d31a6556bf19b
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
@@ -4117,7 +4117,7 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk
 		skb_pull(skb, 2);
 		len = skb->len;
 
-		if (__is_sar_start(control))
+		if (__is_sar_start(control) && __is_iframe(control))
 			len -= 2;
 
 		if (pi->fcs == L2CAP_FCS_CRC16)