diff options
author | David S. Miller <davem@davemloft.net> | 2011-12-06 16:48:14 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-06 16:48:14 -0500 |
commit | 8f0315190dec88bf035d50e4fd1db89859b414f6 (patch) | |
tree | ebc3d6669124188439da105da919e46ce8ea0619 | |
parent | f2fd5c3458ffcf4f9b4fbfa64980dffe1850f7de (diff) |
ipv6: Make third arg to anycast_dst_alloc() bool.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/ip6_route.h | 2 | ||||
-rw-r--r-- | net/ipv6/addrconf.c | 2 | ||||
-rw-r--r-- | net/ipv6/anycast.c | 2 | ||||
-rw-r--r-- | net/ipv6/route.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 5e91b72fc718..f9dbf472bf58 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h | |||
@@ -102,7 +102,7 @@ extern void fib6_force_start_gc(struct net *net); | |||
102 | 102 | ||
103 | extern struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev, | 103 | extern struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev, |
104 | const struct in6_addr *addr, | 104 | const struct in6_addr *addr, |
105 | int anycast); | 105 | bool anycast); |
106 | 106 | ||
107 | extern int ip6_dst_hoplimit(struct dst_entry *dst); | 107 | extern int ip6_dst_hoplimit(struct dst_entry *dst); |
108 | 108 | ||
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 058cc222b3f1..94f3fd91a1a6 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -630,7 +630,7 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr, int pfxlen, | |||
630 | goto out; | 630 | goto out; |
631 | } | 631 | } |
632 | 632 | ||
633 | rt = addrconf_dst_alloc(idev, addr, 0); | 633 | rt = addrconf_dst_alloc(idev, addr, false); |
634 | if (IS_ERR(rt)) { | 634 | if (IS_ERR(rt)) { |
635 | err = PTR_ERR(rt); | 635 | err = PTR_ERR(rt); |
636 | goto out; | 636 | goto out; |
diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c index fc1cdcd7041a..cc540f9ad130 100644 --- a/net/ipv6/anycast.c +++ b/net/ipv6/anycast.c | |||
@@ -289,7 +289,7 @@ int ipv6_dev_ac_inc(struct net_device *dev, const struct in6_addr *addr) | |||
289 | goto out; | 289 | goto out; |
290 | } | 290 | } |
291 | 291 | ||
292 | rt = addrconf_dst_alloc(idev, addr, 1); | 292 | rt = addrconf_dst_alloc(idev, addr, true); |
293 | if (IS_ERR(rt)) { | 293 | if (IS_ERR(rt)) { |
294 | kfree(aca); | 294 | kfree(aca); |
295 | err = PTR_ERR(rt); | 295 | err = PTR_ERR(rt); |
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 09412baf1ca6..f0b582b26209 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -2056,7 +2056,7 @@ static int ip6_pkt_prohibit_out(struct sk_buff *skb) | |||
2056 | 2056 | ||
2057 | struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev, | 2057 | struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev, |
2058 | const struct in6_addr *addr, | 2058 | const struct in6_addr *addr, |
2059 | int anycast) | 2059 | bool anycast) |
2060 | { | 2060 | { |
2061 | struct net *net = dev_net(idev->dev); | 2061 | struct net *net = dev_net(idev->dev); |
2062 | struct rt6_info *rt = ip6_dst_alloc(&net->ipv6.ip6_dst_ops, | 2062 | struct rt6_info *rt = ip6_dst_alloc(&net->ipv6.ip6_dst_ops, |