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/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
index cb43df690210..9772fbd8a3f5 100644
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
@@ -433,32 +433,32 @@ static int mem_check(struct sock *sk)
         return 0;
 }
 
-static int ipv6_hdr_cmp(struct ipv6_opt_hdr *h1, struct ipv6_opt_hdr *h2)
+static bool ipv6_hdr_cmp(struct ipv6_opt_hdr *h1, struct ipv6_opt_hdr *h2)
 {
         if (h1 == h2)
-                return 0;
+                return false;
         if (h1 == NULL || h2 == NULL)
-                return 1;
+                return true;
         if (h1->hdrlen != h2->hdrlen)
-                return 1;
+                return true;
         return memcmp(h1+1, h2+1, ((h1->hdrlen+1)<<3) - sizeof(*h1));
 }
 
-static int ipv6_opt_cmp(struct ipv6_txoptions *o1, struct ipv6_txoptions *o2)
+static bool ipv6_opt_cmp(struct ipv6_txoptions *o1, struct ipv6_txoptions *o2)
 {
         if (o1 == o2)
-                return 0;
+                return false;
         if (o1 == NULL || o2 == NULL)
-                return 1;
+                return true;
         if (o1->opt_nflen != o2->opt_nflen)
-                return 1;
+                return true;
         if (ipv6_hdr_cmp(o1->hopopt, o2->hopopt))
-                return 1;
+                return true;
         if (ipv6_hdr_cmp(o1->dst0opt, o2->dst0opt))
-                return 1;
+                return true;
         if (ipv6_hdr_cmp((struct ipv6_opt_hdr *)o1->srcrt, (struct ipv6_opt_hdr *)o2->srcrt))
-                return 1;
-        return 0;
+                return true;
+        return false;
 }
 
 static inline void fl_link(struct ipv6_pinfo *np, struct ipv6_fl_socklist *sfl,