diff options
| author | Chas Williams <chas@cmf.nrl.navy.mil> | 2011-08-01 17:56:14 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-17 10:55:52 -0700 |
| commit | 55041e081ef433774279ecb6fc3fd30f741f5f37 (patch) | |
| tree | 6e77743bce1c4cd9b6455cf79157a25c1911025b /net | |
| parent | d7a8a78d13730620f9527cff14b444266c05e0cb (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: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
| -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 2252c2085da..52cfd0c3ea7 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); |