summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPravin B Shelar <pshelar@nicira.com>2014-10-30 00:49:57 -0700
committerDavid S. Miller <davem@davemloft.net>2014-10-31 15:47:21 -0400
commitf7065f4bd3fe4ad6bf7e49ba7c68baa2c7046146 (patch)
tree51c3626fde3521b21a50debb43ae9fba7bfcc3d0 /net
parentd59c876dd61f3c151db077f9d73774e605f2b35e (diff)
downloadlinux-f7065f4bd3fe4ad6bf7e49ba7c68baa2c7046146.tar.gz
linux-f7065f4bd3fe4ad6bf7e49ba7c68baa2c7046146.tar.bz2
linux-f7065f4bd3fe4ad6bf7e49ba7c68baa2c7046146.zip
mpls: Fix mpls_gso handler.
mpls gso handler needs to pull skb after segmenting skb. CC: Simon Horman <simon.horman@netronome.com> Signed-off-by: Pravin B Shelar <pshelar@nicira.com> Acked-by: Simon Horman <simon.horman@netronome.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/mpls/mpls_gso.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mpls/mpls_gso.c b/net/mpls/mpls_gso.c
index f0f5309a2d72..e3545f21a099 100644
--- a/net/mpls/mpls_gso.c
+++ b/net/mpls/mpls_gso.c
@@ -59,8 +59,7 @@ static struct sk_buff *mpls_gso_segment(struct sk_buff *skb,
* above pulled. It will be re-pushed after returning
* skb_mac_gso_segment(), an indirect caller of this function.
*/
- __skb_push(skb, skb->data - skb_mac_header(skb));
-
+ __skb_pull(skb, skb->data - skb_mac_header(skb));
out:
return segs;
}