diff options
author | YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org> | 2013-01-21 01:48:34 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-21 13:33:15 -0500 |
commit | af9a997629488ba5f92dc3d76e1ec51fcd759c5d (patch) | |
tree | a249ce4bbdbca949e3bf72e16a972ec76c3d5e7a /net | |
parent | f382d03ad003815be6dc268711659d4475fb7d28 (diff) |
ndisc: Remove dev argument for ndisc_send_skb().
Since we have skb->dev, 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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index ed3ba8eb9505..200b2b22b9ba 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -463,14 +463,14 @@ static struct sk_buff *ndisc_build_skb(struct net_device *dev, | |||
463 | return skb; | 463 | return skb; |
464 | } | 464 | } |
465 | 465 | ||
466 | static void ndisc_send_skb(struct sk_buff *skb, struct net_device *dev, | 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) | 469 | struct icmp6hdr *icmp6h) |
470 | { | 470 | { |
471 | struct flowi6 fl6; | 471 | struct flowi6 fl6; |
472 | struct dst_entry *dst; | 472 | struct dst_entry *dst; |
473 | struct net *net = dev_net(dev); | 473 | struct net *net = dev_net(skb->dev); |
474 | struct sock *sk = net->ipv6.ndisc_sk; | 474 | struct sock *sk = net->ipv6.ndisc_sk; |
475 | struct inet6_dev *idev; | 475 | struct inet6_dev *idev; |
476 | int err; | 476 | int err; |
@@ -478,8 +478,8 @@ static void ndisc_send_skb(struct sk_buff *skb, struct net_device *dev, | |||
478 | 478 | ||
479 | type = icmp6h->icmp6_type; | 479 | type = icmp6h->icmp6_type; |
480 | 480 | ||
481 | icmpv6_flow_init(sk, &fl6, type, saddr, daddr, dev->ifindex); | 481 | icmpv6_flow_init(sk, &fl6, type, saddr, daddr, skb->dev->ifindex); |
482 | dst = icmp6_dst_alloc(dev, &fl6); | 482 | dst = icmp6_dst_alloc(skb->dev, &fl6); |
483 | if (IS_ERR(dst)) { | 483 | if (IS_ERR(dst)) { |
484 | kfree_skb(skb); | 484 | kfree_skb(skb); |
485 | return; | 485 | return; |
@@ -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, dev, daddr, saddr, icmp6h); | 519 | ndisc_send_skb(skb, daddr, saddr, icmp6h); |
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, |