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, 5 insertions, 4 deletions

diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index 1ca5d45a12e8..21a15dfe4a9e 100644
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
@@ -170,7 +170,8 @@ static int ip6_input_finish(struct sk_buff *skb)
 {
         const struct inet6_protocol *ipprot;
         unsigned int nhoff;
-        int nexthdr, raw;
+        int nexthdr;
+        bool raw;
         u8 hash;
         struct inet6_dev *idev;
         struct net *net = dev_net(skb_dst(skb)->dev);
@@ -251,7 +252,7 @@ int ip6_input(struct sk_buff *skb)
 int ip6_mc_input(struct sk_buff *skb)
 {
         const struct ipv6hdr *hdr;
-        int deliver;
+        bool deliver;
 
         IP6_UPD_PO_STATS_BH(dev_net(skb_dst(skb)->dev),
                          ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_INMCAST,
@@ -287,7 +288,7 @@ int ip6_mc_input(struct sk_buff *skb)
                          * is for MLD (0x0000).
                          */
                         if ((ptr[2] | ptr[3]) == 0) {
-                                deliver = 0;
+                                deliver = false;
 
                                 if (!ipv6_ext_hdr(nexthdr)) {
                                         /* BUG */
@@ -312,7 +313,7 @@ int ip6_mc_input(struct sk_buff *skb)
                                 case ICMPV6_MGM_REPORT:
                                 case ICMPV6_MGM_REDUCTION:
                                 case ICMPV6_MLD2_REPORT:
-                                        deliver = 1;
+                                        deliver = true;
                                         break;
                                 }
                                 goto out;