diff options
author | Chas Williams <chas@cmf.nrl.navy.mil> | 2011-08-01 17:56:14 -0700 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-17 11:21:31 -0400 |
commit | 011449930966f7f203814020ae9f910af49282a6 (patch) | |
tree | 40976277da4dc030884215acaa0b0dbdf322ad4f | |
parent | 3c3340a7ccf7ed974e32434fe251bf86472a8a7b (diff) |
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: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r-- | net/atm/br2684.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/atm/br2684.c b/net/atm/br2684.c index d6c7ceaf13e9..f3bae1476798 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c @@ -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); |