]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
atm: br2864: sent packets truncated in VC routed mode
authorChas Williams <chas@cmf.nrl.navy.mil>
Tue, 2 Aug 2011 00:56:14 +0000 (17:56 -0700)
committerPaul Gortmaker <paul.gortmaker@windriver.com>
Thu, 17 May 2012 15:21:31 +0000 (11:21 -0400)
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: Paul Gortmaker <paul.gortmaker@windriver.com>
net/atm/br2684.c

index d6c7ceaf13e969171eb96fb54e5a7ea2ed03844e..f3bae1476798e910c024f274021671810a593e73 100644 (file)
@@ -205,8 +205,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);