From a0316bb0fff7f2c4bc84a6cf3dcda81d74a977fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?YOSHIFUJI=20Hideaki=20/=20=E5=90=89=E8=97=A4=E8=8B=B1?= =?UTF-8?q?=E6=98=8E?= Date: Mon, 21 Jan 2013 06:48:44 +0000 Subject: [PATCH] --- yaml --- r: 351517 b: refs/heads/master c: 5135e633f92ab4deb3600a30cbbec6e0929fc8a4 h: refs/heads/master i: 351515: 5c85edfcf70ace2dfe2c5cae79817e652b6fc62e v: v3 --- [refs] | 2 +- trunk/net/ipv6/ndisc.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0f9fffc843e8..3e8c9906db9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 527a150fb2292a59ca0545dace8d482581253532 +refs/heads/master: 5135e633f92ab4deb3600a30cbbec6e0929fc8a4 diff --git a/trunk/net/ipv6/ndisc.c b/trunk/net/ipv6/ndisc.c index 09171fdbc312..62b1415bec25 100644 --- a/trunk/net/ipv6/ndisc.c +++ b/trunk/net/ipv6/ndisc.c @@ -388,6 +388,7 @@ static struct sk_buff *ndisc_alloc_skb(struct net_device *dev, skb->dev = dev; skb_reserve(skb, hlen + sizeof(struct ipv6hdr)); + skb_reset_transport_header(skb); return skb; } @@ -438,7 +439,6 @@ static struct sk_buff *ndisc_build_skb(struct net_device *dev, if (!skb) return NULL; - skb->transport_header = skb->tail; skb_put(skb, len); hdr = (struct icmp6hdr *)skb_transport_header(skb); @@ -1479,7 +1479,6 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target) if (!buff) goto release; - skb_set_transport_header(buff, skb_tail_pointer(buff) - buff->data); skb_put(buff, len); msg = (struct rd_msg *)icmp6_hdr(buff);