diff options
author | John Stultz <john.stultz@linaro.org> | 2011-08-19 16:42:01 -0700 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2011-08-19 16:42:01 -0700 |
commit | 312effedac183148411c965e20a62e73f23979f6 (patch) | |
tree | 81e466e84e7a2ebe9ee53e5d0963dc2d3c3f7356 /net/atm/br2684.c | |
parent | d3828df964e542533765b23f9a343657c7860e17 (diff) | |
parent | dbf7603a92cd895b8c1017734bc30fd9a32fd933 (diff) |
Merge branch 'upstream/linaro-3.0' into linaro-android-3.0linux-linaro-3.0-2011.08-0-android-1
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); |