diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-14 21:05:03 -0300 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-25 22:26:00 -0700 |
| commit | 55f79cc0c02f9ce8f85e965e9679796f62b790f5 (patch) | |
| tree | 084c727a90562de1b31eff84a1b1804edcd11100 /net | |
| parent | eeeb03745bf9ea352df2373b9cb5fa14e60a2de0 (diff) | |
| download | linux-3.10-55f79cc0c02f9ce8f85e965e9679796f62b790f5.tar.gz linux-3.10-55f79cc0c02f9ce8f85e965e9679796f62b790f5.tar.bz2 linux-3.10-55f79cc0c02f9ce8f85e965e9679796f62b790f5.zip | |
[IPV6]: Reset the network header in ip6_nd_hdr
ip6_nd_hdr is always called immediately after a alloc_skb + skb_reserve
sequence, i.e. when skb->tail is equal to skb->data, making it correct to use
skb_reset_network_header().
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/ip6_output.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 49523c2a9f1..32e8c3f73c7 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -263,7 +263,8 @@ int ip6_nd_hdr(struct sock *sk, struct sk_buff *skb, struct net_device *dev, totlen = len + sizeof(struct ipv6hdr); - skb->nh.raw = skb_put(skb, sizeof(struct ipv6hdr)); + skb_reset_network_header(skb); + skb_put(skb, sizeof(struct ipv6hdr)); hdr = ipv6_hdr(skb); *(__be32*)hdr = htonl(0x60000000); |