From: Chas Williams <chas@cmf.nrl.navy.mil>
Date: Tue, 2 Aug 2011 00:56:14 +0000 (-0700)
Subject: atm: br2864: sent packets truncated in VC routed mode
X-Git-Tag: firefly_0821_release~7541^2~2917
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=55041e081ef433774279ecb6fc3fd30f741f5f37;p=firefly-linux-kernel-4.4.55.git

atm: br2864: sent packets truncated in VC routed mode

commit a08af810cdc29d2ca930e8a869d3d01744c392d8 upstream.

Reported-by: Pascal Hambourg <pascal@plouf.fr.eu.org>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 2252c2085dac..52cfd0c3ea71 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);