diff mbox

[1/1] atm: br2864: sent packets truncated in VC routed mode

Message ID 201108011503.p71F3Tan031501@cmf.nrl.navy.mil
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

chas williams - CONTRACTOR Aug. 1, 2011, 3:03 p.m. UTC 
hopefully this could be included for the next kernel release.

From: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>

commit 8b5e1c9db2bcd2d13c2db08e6c6dbe66882fa186
Author: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Date:   Mon Aug 1 07:55:07 2011 -0400

    atm: br2864: sent packets truncated in VC routed mode
    
    Reported-by: Pascal Hambourg <pascal@plouf.fr.eu.org>
    Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

David Miller Aug. 2, 2011, 12:56 a.m. UTC | #1 
From: "chas williams - CONTRACTOR" <chas@cmf.nrl.navy.mil>
Date: Mon, 01 Aug 2011 11:03:29 -0400

>     atm: br2864: sent packets truncated in VC routed mode
>     
>     Reported-by: Pascal Hambourg <pascal@plouf.fr.eu.org>
>     Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 2252c20..52cfd0c 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -242,8 +242,6 @@  static int br2684_xmit_vcc(struct sk_buff *skb, struct net_device *dev,
 		if (brdev->payload == p_bridged) {
 			skb_push(skb, 2);
 			memset(skb->data, 0, 2);
-		} else { /* p_routed */
-			skb_pull(skb, ETH_HLEN);
 		}
 	}
 	skb_debug(skb);