ipv6: bool/const conversions phase2

Mostly bool conversions, some inline removals and const additions.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 12 insertions, 12 deletions

diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c
index 95aea16b8b6f..eb6a63632d3c 100644
--- a/net/ipv6/addrlabel.c
+++ b/net/ipv6/addrlabel.c
@@ -129,7 +129,7 @@ static void ip6addrlbl_free_rcu(struct rcu_head *h)
         ip6addrlbl_free(container_of(h, struct ip6addrlbl_entry, rcu));
 }
 
-static inline int ip6addrlbl_hold(struct ip6addrlbl_entry *p)
+static bool ip6addrlbl_hold(struct ip6addrlbl_entry *p)
 {
         return atomic_inc_not_zero(&p->refcnt);
 }
@@ -141,20 +141,20 @@ static inline void ip6addrlbl_put(struct ip6addrlbl_entry *p)
 }
 
 /* Find label */
-static int __ip6addrlbl_match(struct net *net,
-                              struct ip6addrlbl_entry *p,
-                              const struct in6_addr *addr,
-                              int addrtype, int ifindex)
+static bool __ip6addrlbl_match(struct net *net,
+                               const struct ip6addrlbl_entry *p,
+                               const struct in6_addr *addr,
+                               int addrtype, int ifindex)
 {
         if (!net_eq(ip6addrlbl_net(p), net))
-                return 0;
+                return false;
         if (p->ifindex && p->ifindex != ifindex)
-                return 0;
+                return false;
         if (p->addrtype && p->addrtype != addrtype)
-                return 0;
+                return false;
         if (!ipv6_prefix_equal(addr, &p->prefix, p->prefixlen))
-                return 0;
-        return 1;
+                return false;
+        return true;
 }
 
 static struct ip6addrlbl_entry *__ipv6_addr_label(struct net *net,
@@ -456,8 +456,8 @@ static int ip6addrlbl_newdel(struct sk_buff *skb, struct nlmsghdr *nlh,
         return err;
 }
 
-static inline void ip6addrlbl_putmsg(struct nlmsghdr *nlh,
-                                     int prefixlen, int ifindex, u32 lseq)
+static void ip6addrlbl_putmsg(struct nlmsghdr *nlh,
+                              int prefixlen, int ifindex, u32 lseq)
 {
         struct ifaddrlblmsg *ifal = nlmsg_data(nlh);
         ifal->ifal_family = AF_INET6;