From 91da7cfefd9730d168986a3fda405cf26c5f4e39 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Sun, 30 Jul 2006 20:19:11 -0700 Subject: [PATCH] --- yaml --- r: 33077 b: refs/heads/master c: 679e898a4742d4a4a47430b67fd68a789a73dcfd h: refs/heads/master i: 33075: 65e465375fd08371172186ff584d905aa2d59499 v: v3 --- [refs] | 2 +- trunk/net/ipv6/xfrm6_output.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9a9bee096d5c..192501e8f01e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 081bba5b3ace5698eccf2f1a378cd4a9a4c98a85 +refs/heads/master: 679e898a4742d4a4a47430b67fd68a789a73dcfd diff --git a/trunk/net/ipv6/xfrm6_output.c b/trunk/net/ipv6/xfrm6_output.c index 0eea60ea9ebc..c8c8b44a0f58 100644 --- a/trunk/net/ipv6/xfrm6_output.c +++ b/trunk/net/ipv6/xfrm6_output.c @@ -125,7 +125,7 @@ static int xfrm6_output_finish(struct sk_buff *skb) 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)))