netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net 1/2] mpls: Fix mpls_gso handler.
@ 2014-10-30  7:49 Pravin B Shelar
  2014-10-31  6:41 ` Simon Horman
  2014-10-31 19:47 ` David Miller
  0 siblings, 2 replies; 3+ messages in thread
From: Pravin B Shelar @ 2014-10-30  7:49 UTC (permalink / raw)
  To: davem; +Cc: netdev, Pravin B Shelar, Simon Horman

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(-)

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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH net 1/2] mpls: Fix mpls_gso handler.
  2014-10-30  7:49 [PATCH net 1/2] mpls: Fix mpls_gso handler Pravin B Shelar
@ 2014-10-31  6:41 ` Simon Horman
  2014-10-31 19:47 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2014-10-31  6:41 UTC (permalink / raw)
  To: Pravin B Shelar; +Cc: davem, netdev

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
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH net 1/2] mpls: Fix mpls_gso handler.
  2014-10-30  7:49 [PATCH net 1/2] mpls: Fix mpls_gso handler Pravin B Shelar
  2014-10-31  6:41 ` Simon Horman
@ 2014-10-31 19:47 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2014-10-31 19:47 UTC (permalink / raw)
  To: pshelar; +Cc: netdev, simon.horman

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.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-10-31 19:47 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-30  7:49 [PATCH net 1/2] mpls: Fix mpls_gso handler Pravin B Shelar
2014-10-31  6:41 ` Simon Horman
2014-10-31 19:47 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).