ipv6: bool/const conversions phase2

[deliverable/linux.git] / net / ipv6 / icmp.c

diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 27ac95a6342927e5365af6616af82815e603619e..091a2971c7b70e53bca67a51305ca6751ee5f161 100644 (file)
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -29,6 +29,8 @@
  *     Kazunori MIYAZAWA @USAGI:       change output process to use ip6_append_data
  */
 
+#define pr_fmt(fmt) "IPv6: " fmt
+
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/types.h>
@@ -129,7 +131,7 @@ void icmpv6_param_prob(struct sk_buff *skb, u8 code, int pos)
  *     --ANK (980726)
  */
 
-static int is_ineligible(struct sk_buff *skb)
+static bool is_ineligible(const struct sk_buff *skb)
 {
        int ptr = (u8 *)(ipv6_hdr(skb) + 1) - skb->data;
        int len = skb->len - ptr;
@@ -137,11 +139,11 @@ static int is_ineligible(struct sk_buff *skb)
        __be16 frag_off;
 
        if (len < 0)
-               return 1;
+               return true;
 
        ptr = ipv6_skip_exthdr(skb, ptr, &nexthdr, &frag_off);
        if (ptr < 0)
-               return 0;
+               return false;
        if (nexthdr == IPPROTO_ICMPV6) {
                u8 _type, *tp;
                tp = skb_header_pointer(skb,
@@ -149,9 +151,9 @@ static int is_ineligible(struct sk_buff *skb)
                        sizeof(_type), &_type);
                if (tp == NULL ||
                    !(*tp & ICMPV6_INFOMSG_MASK))
-                       return 1;
+                       return true;
        }
-       return 0;
+       return false;
 }
 
 /*
@@ -206,14 +208,14 @@ static inline bool icmpv6_xrlim_allow(struct sock *sk, u8 type,
  *     highest-order two bits set to 10
  */
 
-static __inline__ int opt_unrec(struct sk_buff *skb, __u32 offset)
+static bool opt_unrec(struct sk_buff *skb, __u32 offset)
 {
        u8 _optval, *op;
 
        offset += skb_network_offset(skb);
        op = skb_header_pointer(skb, offset, sizeof(_optval), &_optval);
        if (op == NULL)
-               return 1;
+               return true;
        return (*op & 0xC0) == 0x80;
 }
 
@@ -498,7 +500,7 @@ void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info)
        err = ip6_append_data(sk, icmpv6_getfrag, &msg,
                              len + sizeof(struct icmp6hdr),
                              sizeof(struct icmp6hdr), hlimit,
-                             np->tclass, NULL, &fl6, (struct rt6_info*)dst,
+                             np->tclass, NULL, &fl6, (struct rt6_info *)dst,
                              MSG_DONTWAIT, np->dontfrag);
        if (err) {
                ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTERRORS);
@@ -579,7 +581,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb)
 
        err = ip6_append_data(sk, icmpv6_getfrag, &msg, skb->len + sizeof(struct icmp6hdr),
                                sizeof(struct icmp6hdr), hlimit, np->tclass, NULL, &fl6,
-                               (struct rt6_info*)dst, MSG_DONTWAIT,
+                               (struct rt6_info *)dst, MSG_DONTWAIT,
                                np->dontfrag);
 
        if (err) {
@@ -820,9 +822,7 @@ static int __net_init icmpv6_sk_init(struct net *net)
                err = inet_ctl_sock_create(&sk, PF_INET6,
                                           SOCK_RAW, IPPROTO_ICMPV6, net);
                if (err < 0) {
-                       printk(KERN_ERR
-                              "Failed to initialize the ICMP6 control socket "
-                              "(err %d).\n",
+                       pr_err("Failed to initialize the ICMP6 control socket (err %d)\n",
                               err);
                        goto fail;
                }
@@ -881,7 +881,7 @@ int __init icmpv6_init(void)
        return 0;
 
 fail:
-       printk(KERN_ERR "Failed to register ICMP6 protocol\n");
+       pr_err("Failed to register ICMP6 protocol\n");
        unregister_pernet_subsys(&icmpv6_sk_ops);
        return err;
 }
@@ -950,7 +950,6 @@ int icmpv6_err_convert(u8 type, u8 code, int *err)
 
        return fatal;
 }
-
 EXPORT_SYMBOL(icmpv6_err_convert);
 
 #ifdef CONFIG_SYSCTL