diff options
author | YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org> | 2013-01-21 01:48:44 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-21 13:33:16 -0500 |
commit | 5135e633f92ab4deb3600a30cbbec6e0929fc8a4 (patch) | |
tree | 7284f3f23963a691bb13601f2ab9cd7e01bbd0fe /net | |
parent | 527a150fb2292a59ca0545dace8d482581253532 (diff) |
ndisc: Reset skb->trasport_headner inside ndisc_alloc_send_skb().
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv6/ndisc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 09171fdbc312..62b1415bec25 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -388,6 +388,7 @@ static struct sk_buff *ndisc_alloc_skb(struct net_device *dev, | |||
388 | skb->dev = dev; | 388 | skb->dev = dev; |
389 | 389 | ||
390 | skb_reserve(skb, hlen + sizeof(struct ipv6hdr)); | 390 | skb_reserve(skb, hlen + sizeof(struct ipv6hdr)); |
391 | skb_reset_transport_header(skb); | ||
391 | 392 | ||
392 | return skb; | 393 | return skb; |
393 | } | 394 | } |
@@ -438,7 +439,6 @@ static struct sk_buff *ndisc_build_skb(struct net_device *dev, | |||
438 | if (!skb) | 439 | if (!skb) |
439 | return NULL; | 440 | return NULL; |
440 | 441 | ||
441 | skb->transport_header = skb->tail; | ||
442 | skb_put(skb, len); | 442 | skb_put(skb, len); |
443 | 443 | ||
444 | hdr = (struct icmp6hdr *)skb_transport_header(skb); | 444 | hdr = (struct icmp6hdr *)skb_transport_header(skb); |
@@ -1479,7 +1479,6 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target) | |||
1479 | if (!buff) | 1479 | if (!buff) |
1480 | goto release; | 1480 | goto release; |
1481 | 1481 | ||
1482 | skb_set_transport_header(buff, skb_tail_pointer(buff) - buff->data); | ||
1483 | skb_put(buff, len); | 1482 | skb_put(buff, len); |
1484 | msg = (struct rd_msg *)icmp6_hdr(buff); | 1483 | msg = (struct rd_msg *)icmp6_hdr(buff); |
1485 | 1484 | ||