]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.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)
committerDavid S. Miller <davem@davemloft.net>
Tue, 2 Aug 2011 00:56:14 +0000 (17:56 -0700)
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>
net/atm/br2684.c

index 2252c2085dacd583d1894e2a5e47d010f82394e4..52cfd0c3ea71f19ef844531d055b4f96a0eb6e27 100644 (file)
@@ -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);