commit 1ced98e81d1c2f1ce965ecf8d0032e02ffa07bf0
author Arnaldo Carvalho de Melo <acme@redhat.com> Sat Mar 10 19:57:15 2007 -0300
committer David S. Miller <davem@sunset.davemloft.net> Wed Apr 25 22:24:54 2007 -0700
tree 135955ffd557808f97aeb126efde39f8eeaeefbf
parent 8856dfa3e9b71ac2177016f66ace3a8978afecc1

[SK_BUFF] ipv6: More skb_reset_network_header conversions related to skb_pull

Now related to this form:

skb->nh.ipv6h = (struct ipv6hdr *)skb_put(skb, length);

That, as the others, is done when skb->tail is still equal to skb->data, making
the conversion to skb_reset_network_header possible.

Also one more case equivalent to skb->nh.raw = skb->data, of this form:

iph = (struct ipv6hdr *)skb->data;
<SNIP>
skb->nh.ipv6h = iph;

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/ipv6/raw.c

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 203e069..5f26645 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -575,7 +575,9 @@
 	skb->priority = sk->sk_priority;
 	skb->dst = dst_clone(&rt->u.dst);
 
-	skb->nh.ipv6h = iph = (struct ipv6hdr *)skb_put(skb, length);
+	skb_put(skb, length);
+	skb_reset_network_header(skb);
+	iph = skb->nh.ipv6h;
 
 	skb->ip_summed = CHECKSUM_NONE;