summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChas Williams <chas@cmf.nrl.navy.mil>2011-08-02 02:56:14 +0200
committerDavid S. Miller <davem@davemloft.net>2011-08-02 02:56:14 +0200
commita08af810cdc29d2ca930e8a869d3d01744c392d8 (patch)
tree6271e1bdb3d9d54ccb612ddbfdc1b2d252fbbb13
parentsch_sfq: fix sfq_enqueue() (diff)
downloadlinux-a08af810cdc29d2ca930e8a869d3d01744c392d8.tar.xz
linux-a08af810cdc29d2ca930e8a869d3d01744c392d8.zip
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> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/atm/br2684.c2
1 files changed, 0 insertions, 2 deletions
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);