| Message ID | 1414655397-1541-1-git-send-email-pshelar@nicira.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, Oct 30, 2014 at 12:49:57AM -0700, Pravin B Shelar wrote: > 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> Apologies for messing that up, your change does seem to match the comment above it. So, assuming that this has been tested: Acked-by: Simon Horman <simon.horman@netronome.com> > --- > net/mpls/mpls_gso.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/net/mpls/mpls_gso.c b/net/mpls/mpls_gso.c > index f0f5309..e3545f2 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; > } > -- > 1.7.1 > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Pravin B Shelar <pshelar@nicira.com> Date: Thu, 30 Oct 2014 00:49:57 -0700 > 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> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/mpls/mpls_gso.c b/net/mpls/mpls_gso.c index f0f5309..e3545f2 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; }
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> --- net/mpls/mpls_gso.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)