Commit:     55f79cc0c02f9ce8f85e965e9679796f62b790f5
Parent:     eeeb03745bf9ea352df2373b9cb5fa14e60a2de0
Author:     Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
AuthorDate: Wed Mar 14 21:05:03 2007 -0300
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Apr 25 22:26:00 2007 -0700

    [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 
    Signed-off-by: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 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 49523c2..32e8c3f 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);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to