diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-17 22:47:15 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-17 22:47:15 -0400 |
| commit | dbf7603a92cd895b8c1017734bc30fd9a32fd933 (patch) | |
| tree | 7e0e8c35d5db964ee43494a721dee3c486e4e458 /net/atm/br2684.c | |
| parent | 044c31fdf80ed9d8e6bfb33913d085c3efc6febe (diff) | |
| parent | d31bf2883542cd3414674238f94123bd1d9c0b9f (diff) | |
Merge commit 'v3.0.3' into linaro-3.0linux-linaro-3.0-2011.08-0
Diffstat (limited to 'net/atm/br2684.c')
| -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); |