diff options
author | YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org> | 2013-01-21 01:48:58 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-21 13:33:17 -0500 |
commit | aa4bdd4b3f43274252c1280f6464850b0f004fc8 (patch) | |
tree | 8a707684641c01d5933c77ac94be94bcb8f1abd5 /net | |
parent | 5f5a0115635bf678d267cbc72169a718e8724d03 (diff) |
ndisc: Remove icmp6h argument from ndisc_send_skb().
skb_transport_header() (thus icmp6_hdr()) is available here,
use it.
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index ed786441bc51..f0c436b49255 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -465,8 +465,7 @@ static struct sk_buff *ndisc_build_skb(struct net_device *dev, | |||
465 | 465 | ||
466 | static void ndisc_send_skb(struct sk_buff *skb, | 466 | static void ndisc_send_skb(struct sk_buff *skb, |
467 | const struct in6_addr *daddr, | 467 | const struct in6_addr *daddr, |
468 | const struct in6_addr *saddr, | 468 | const struct in6_addr *saddr) |
469 | struct icmp6hdr *icmp6h) | ||
470 | { | 469 | { |
471 | struct flowi6 fl6; | 470 | struct flowi6 fl6; |
472 | struct dst_entry *dst; | 471 | struct dst_entry *dst; |
@@ -474,6 +473,7 @@ static void ndisc_send_skb(struct sk_buff *skb, | |||
474 | struct sock *sk = net->ipv6.ndisc_sk; | 473 | struct sock *sk = net->ipv6.ndisc_sk; |
475 | struct inet6_dev *idev; | 474 | struct inet6_dev *idev; |
476 | int err; | 475 | int err; |
476 | struct icmp6hdr *icmp6h = icmp6_hdr(skb); | ||
477 | u8 type; | 477 | u8 type; |
478 | 478 | ||
479 | type = icmp6h->icmp6_type; | 479 | type = icmp6h->icmp6_type; |
@@ -516,7 +516,7 @@ static void __ndisc_send(struct net_device *dev, | |||
516 | if (!skb) | 516 | if (!skb) |
517 | return; | 517 | return; |
518 | 518 | ||
519 | ndisc_send_skb(skb, daddr, saddr, icmp6h); | 519 | ndisc_send_skb(skb, daddr, saddr); |
520 | } | 520 | } |
521 | 521 | ||
522 | static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh, | 522 | static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh, |