diff options
| author | YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org> | 2013-01-20 02:39:18 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-20 22:29:49 -0500 |
| commit | fb568637e58a8459edd551af1160f27ea53e8367 (patch) | |
| tree | a0579ed6564612ec86ccd6e193a31b107070a932 /net/ipv6/ndisc.c | |
| parent | d1641565f6926c2e9f5859d81bc6f72fc0e1ad76 (diff) | |
ndisc: Make several arguments for ndisc_send_na() boolean.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ndisc.c')
| -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 903191adb5ca..067a0d2eb557 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
| @@ -490,7 +490,7 @@ static void __ndisc_send(struct net_device *dev, | |||
| 490 | static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh, | 490 | static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh, |
| 491 | const struct in6_addr *daddr, | 491 | const struct in6_addr *daddr, |
| 492 | const struct in6_addr *solicited_addr, | 492 | const struct in6_addr *solicited_addr, |
| 493 | int router, int solicited, int override, int inc_opt) | 493 | bool router, bool solicited, bool override, bool inc_opt) |
| 494 | { | 494 | { |
| 495 | struct in6_addr tmpaddr; | 495 | struct in6_addr tmpaddr; |
| 496 | struct inet6_ifaddr *ifp; | 496 | struct inet6_ifaddr *ifp; |
| @@ -776,11 +776,11 @@ static void ndisc_recv_ns(struct sk_buff *skb) | |||
| 776 | } | 776 | } |
| 777 | 777 | ||
| 778 | if (is_router < 0) | 778 | if (is_router < 0) |
| 779 | is_router = !!idev->cnf.forwarding; | 779 | is_router = idev->cnf.forwarding; |
| 780 | 780 | ||
| 781 | if (dad) { | 781 | if (dad) { |
| 782 | ndisc_send_na(dev, NULL, &in6addr_linklocal_allnodes, &msg->target, | 782 | ndisc_send_na(dev, NULL, &in6addr_linklocal_allnodes, &msg->target, |
| 783 | is_router, 0, (ifp != NULL), 1); | 783 | !!is_router, false, (ifp != NULL), true); |
| 784 | goto out; | 784 | goto out; |
| 785 | } | 785 | } |
| 786 | 786 | ||
| @@ -801,8 +801,8 @@ static void ndisc_recv_ns(struct sk_buff *skb) | |||
| 801 | NEIGH_UPDATE_F_OVERRIDE); | 801 | NEIGH_UPDATE_F_OVERRIDE); |
| 802 | if (neigh || !dev->header_ops) { | 802 | if (neigh || !dev->header_ops) { |
| 803 | ndisc_send_na(dev, neigh, saddr, &msg->target, | 803 | ndisc_send_na(dev, neigh, saddr, &msg->target, |
| 804 | is_router, | 804 | !!is_router, |
| 805 | 1, (ifp != NULL && inc), inc); | 805 | true, (ifp != NULL && inc), inc); |
| 806 | if (neigh) | 806 | if (neigh) |
| 807 | neigh_release(neigh); | 807 | neigh_release(neigh); |
| 808 | } | 808 | } |