netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [XFRM]: Fix protocol field value for outgoing IPv6 GSO packets
@ 2006-07-25  0:09 Patrick McHardy
  2006-07-25  0:13 ` Herbert Xu
  0 siblings, 1 reply; 5+ messages in thread
From: Patrick McHardy @ 2006-07-25  0:09 UTC (permalink / raw)
  To: Herbert Xu; +Cc: Kernel Netdev Mailing List, David S. Miller

[-- Attachment #1: Type: text/plain, Size: 123 bytes --]

This appears to be a mistake, but I didn't follow the GSO stuff
very closely, so there could be some non-obvious reason.



[-- Attachment #2: x --]
[-- Type: text/plain, Size: 927 bytes --]

[XFRM]: Fix protocol field value for outgoing IPv6 GSO packets

Signed-off-by: Patrick McHardy <kaber@trash.net>

---
commit 8035f60a607630459e4440dbbc5a20f3cfbf97ac
tree f1a7061cfd1f923b3991ee8f449cffce86870a3e
parent 440848a8e33fc1927bab45bd73f6c8e042ea7abd
author Patrick McHardy <kaber@trash.net> Tue, 25 Jul 2006 02:02:00 +0200
committer Patrick McHardy <kaber@trash.net> Tue, 25 Jul 2006 02:02:00 +0200

 net/ipv6/xfrm6_output.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
index 0eea60e..c8c8b44 100644
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@ -125,7 +125,7 @@ static int xfrm6_output_finish(struct sk
 	if (!skb_is_gso(skb))
 		return xfrm6_output_finish2(skb);
 
-	skb->protocol = htons(ETH_P_IP);
+	skb->protocol = htons(ETH_P_IPV6);
 	segs = skb_gso_segment(skb, 0);
 	kfree_skb(skb);
 	if (unlikely(IS_ERR(segs)))

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

* Re: [XFRM]: Fix protocol field value for outgoing IPv6 GSO packets
  2006-07-25  0:09 [XFRM]: Fix protocol field value for outgoing IPv6 GSO packets Patrick McHardy
@ 2006-07-25  0:13 ` Herbert Xu
  2006-07-26 22:17   ` David Miller
  2006-07-31  4:06   ` Patrick McHardy
  0 siblings, 2 replies; 5+ messages in thread
From: Herbert Xu @ 2006-07-25  0:13 UTC (permalink / raw)
  To: Patrick McHardy; +Cc: Kernel Netdev Mailing List, David S. Miller

On Tue, Jul 25, 2006 at 02:09:26AM +0200, Patrick McHardy wrote:
> This appears to be a mistake, but I didn't follow the GSO stuff
> very closely, so there could be some non-obvious reason.

Yes it definitely was a mistake! Thanks for picking this up Patrick.

> [XFRM]: Fix protocol field value for outgoing IPv6 GSO packets
> 
> Signed-off-by: Patrick McHardy <kaber@trash.net>

Acked-by: Herbert Xu <herbert@gondor.apana.org.au>

Cheers,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

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

* Re: [XFRM]: Fix protocol field value for outgoing IPv6 GSO packets
  2006-07-25  0:13 ` Herbert Xu
@ 2006-07-26 22:17   ` David Miller
  2006-07-31  4:06   ` Patrick McHardy
  1 sibling, 0 replies; 5+ messages in thread
From: David Miller @ 2006-07-26 22:17 UTC (permalink / raw)
  To: herbert; +Cc: kaber, netdev

From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 25 Jul 2006 10:13:26 +1000

> On Tue, Jul 25, 2006 at 02:09:26AM +0200, Patrick McHardy wrote:
> > This appears to be a mistake, but I didn't follow the GSO stuff
> > very closely, so there could be some non-obvious reason.
> 
> Yes it definitely was a mistake! Thanks for picking this up Patrick.
> 
> > [XFRM]: Fix protocol field value for outgoing IPv6 GSO packets
> > 
> > Signed-off-by: Patrick McHardy <kaber@trash.net>
> 
> Acked-by: Herbert Xu <herbert@gondor.apana.org.au>

Applied, thanks guys.

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

* Re: [XFRM]: Fix protocol field value for outgoing IPv6 GSO packets
  2006-07-25  0:13 ` Herbert Xu
  2006-07-26 22:17   ` David Miller
@ 2006-07-31  4:06   ` Patrick McHardy
  2006-07-31  4:08     ` David Miller
  1 sibling, 1 reply; 5+ messages in thread
From: Patrick McHardy @ 2006-07-31  4:06 UTC (permalink / raw)
  To: David S. Miller; +Cc: Herbert Xu, Kernel Netdev Mailing List

[-- Attachment #1: Type: text/plain, Size: 343 bytes --]

Hi Dave,

Herbert Xu wrote:
> On Tue, Jul 25, 2006 at 02:09:26AM +0200, Patrick McHardy wrote:
> 
>>[XFRM]: Fix protocol field value for outgoing IPv6 GSO packets
>>
>>Signed-off-by: Patrick McHardy <kaber@trash.net>
> 
> Acked-by: Herbert Xu <herbert@gondor.apana.org.au>

I believe you missed this one. Attached again for your convenience.


[-- Attachment #2: x --]
[-- Type: text/plain, Size: 928 bytes --]

[XFRM]: Fix protocol field value for outgoing IPv6 GSO packets

Signed-off-by: Patrick McHardy <kaber@trash.net>

---
commit 8035f60a607630459e4440dbbc5a20f3cfbf97ac
tree f1a7061cfd1f923b3991ee8f449cffce86870a3e
parent 440848a8e33fc1927bab45bd73f6c8e042ea7abd
author Patrick McHardy <kaber@trash.net> Tue, 25 Jul 2006 02:02:00 +0200
committer Patrick McHardy <kaber@trash.net> Tue, 25 Jul 2006 02:02:00 +0200

 net/ipv6/xfrm6_output.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
index 0eea60e..c8c8b44 100644
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@ -125,7 +125,7 @@ static int xfrm6_output_finish(struct sk
 	if (!skb_is_gso(skb))
 		return xfrm6_output_finish2(skb);
 
-	skb->protocol = htons(ETH_P_IP);
+	skb->protocol = htons(ETH_P_IPV6);
 	segs = skb_gso_segment(skb, 0);
 	kfree_skb(skb);
 	if (unlikely(IS_ERR(segs)))


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

* Re: [XFRM]: Fix protocol field value for outgoing IPv6 GSO packets
  2006-07-31  4:06   ` Patrick McHardy
@ 2006-07-31  4:08     ` David Miller
  0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2006-07-31  4:08 UTC (permalink / raw)
  To: kaber; +Cc: herbert, netdev

From: Patrick McHardy <kaber@trash.net>
Date: Mon, 31 Jul 2006 06:06:37 +0200

> Herbert Xu wrote:
> > On Tue, Jul 25, 2006 at 02:09:26AM +0200, Patrick McHardy wrote:
> > 
> >>[XFRM]: Fix protocol field value for outgoing IPv6 GSO packets
> >>
> >>Signed-off-by: Patrick McHardy <kaber@trash.net>
> > 
> > Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
> 
> I believe you missed this one. Attached again for your convenience.

It's in my tree, but thanks for reminding me.

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

end of thread, other threads:[~2006-07-31  4:08 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-07-25  0:09 [XFRM]: Fix protocol field value for outgoing IPv6 GSO packets Patrick McHardy
2006-07-25  0:13 ` Herbert Xu
2006-07-26 22:17   ` David Miller
2006-07-31  4:06   ` Patrick McHardy
2006-07-31  4:08     ` 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).