From 2edbec111e9cbe616a07c0c6d019f5df9481a247 Mon Sep 17 00:00:00 2001 From: "Gustavo F. Padovan" Date: Tue, 11 May 2010 22:14:00 -0300 Subject: [PATCH] --- yaml --- r: 203825 b: refs/heads/master c: bc1b1f8bee63966649dd5ac7d10d31a6556bf19b h: refs/heads/master i: 203823: 0f40ff395b8253591dc2b6a038960206b461cb17 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/l2cap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7bc05125e2a9..aa9defb2a174 100644 --- 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 index a9fdfe401f5b..108c2f290ac5 100644 --- 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)