Skip to contentSkip to conversation

: Fix protocol field value for outgoing IPv6 GSO packets

XFRM Applied Patrick McHardy 3 participants 5 messages Jul 25, 2006 – Jul 31, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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

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

---
commit 8035f60a607630459e4440dbbc5a20f3cfbf97ac
tree f1a7061cfd1f923b3991ee8f449cffce86870a3e
parent 440848a8e33fc1927bab45bd73f6c8e042ea7abd
author Patrick McHardy <[email protected]> Tue, 25 Jul 2006 02:02:00 +0200 committer Patrick McHardy <[email protected]> Tue, 25 Jul 2006 02:02:00 +0200

 net/ipv6/xfrm6_output.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
net/ipv6/xfrm6_output.c +1 -1
index 0eea60e..c8c8b44 100644
@@ -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)))
maintainer Acked-by
#1 lore raw
Quoted 2 lines · Patrick McHardy

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.

Quoted 3 lines

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

Cheers,

Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
maintainer Applied
#2 lore raw

From: Herbert Xu <[email protected]>
Date: Tue, 25 Jul 2006 10:13:26 +1000

Quoted 11 lines · Patrick McHardy
Quoted 2 lines

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.

Quoted 3 lines

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

Applied, thanks guys.

#3 lore raw
In reply to Herbert Xu

Hi Dave,

Quoted 7 lines · Herbert Xu
Quoted 3 lines · Patrick McHardy

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

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

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

---
commit 8035f60a607630459e4440dbbc5a20f3cfbf97ac
tree f1a7061cfd1f923b3991ee8f449cffce86870a3e
parent 440848a8e33fc1927bab45bd73f6c8e042ea7abd
author Patrick McHardy <[email protected]> Tue, 25 Jul 2006 02:02:00 +0200 committer Patrick McHardy <[email protected]> Tue, 25 Jul 2006 02:02:00 +0200

 net/ipv6/xfrm6_output.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
net/ipv6/xfrm6_output.c +1 -1
index 0eea60e..c8c8b44 100644
@@ -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)))