net: ipv6: Standardize prefixes for message logging

[pandora-kernel.git] / net / ipv6 / ip6_tunnel.c

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index aa21da6..7962b3d 100644 (file)
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -18,6 +18,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/capability.h>
 #include <linux/errno.h>
@@ -198,7 +200,7 @@ ip6_tnl_bucket(struct ip6_tnl_net *ip6n, const struct ip6_tnl_parm *p)
 {
        const struct in6_addr *remote = &p->raddr;
        const struct in6_addr *local = &p->laddr;
-       unsigned h = 0;
+       unsigned int h = 0;
        int prio = 0;
 
        if (!ipv6_addr_any(remote) || !ipv6_addr_any(local)) {
@@ -460,19 +462,14 @@ ip6_tnl_err(struct sk_buff *skb, __u8 ipproto, struct inet6_skb_parm *opt,
                struct ipv6_tlv_tnl_enc_lim *tel;
                __u32 mtu;
        case ICMPV6_DEST_UNREACH:
-               if (net_ratelimit())
-                       printk(KERN_WARNING
-                              "%s: Path to destination invalid "
-                              "or inactive!\n", t->parms.name);
+               net_warn_ratelimited("%s: Path to destination invalid or inactive!\n",
+                                    t->parms.name);
                rel_msg = 1;
                break;
        case ICMPV6_TIME_EXCEED:
                if ((*code) == ICMPV6_EXC_HOPLIMIT) {
-                       if (net_ratelimit())
-                               printk(KERN_WARNING
-                                      "%s: Too small hop limit or "
-                                      "routing loop in tunnel!\n",
-                                      t->parms.name);
+                       net_warn_ratelimited("%s: Too small hop limit or routing loop in tunnel!\n",
+                                            t->parms.name);
                        rel_msg = 1;
                }
                break;
@@ -484,17 +481,13 @@ ip6_tnl_err(struct sk_buff *skb, __u8 ipproto, struct inet6_skb_parm *opt,
                if (teli && teli == *info - 2) {
                        tel = (struct ipv6_tlv_tnl_enc_lim *) &skb->data[teli];
                        if (tel->encap_limit == 0) {
-                               if (net_ratelimit())
-                                       printk(KERN_WARNING
-                                              "%s: Too small encapsulation "
-                                              "limit or routing loop in "
-                                              "tunnel!\n", t->parms.name);
+                               net_warn_ratelimited("%s: Too small encapsulation limit or routing loop in tunnel!\n",
+                                                    t->parms.name);
                                rel_msg = 1;
                        }
-               } else if (net_ratelimit()) {
-                       printk(KERN_WARNING
-                              "%s: Recipient unable to parse tunneled "
-                              "packet!\n ", t->parms.name);
+               } else {
+                       net_warn_ratelimited("%s: Recipient unable to parse tunneled packet!\n",
+                                            t->parms.name);
                }
                break;
        case ICMPV6_PKT_TOOBIG:
@@ -845,15 +838,12 @@ static inline int ip6_tnl_xmit_ctl(struct ip6_tnl *t)
                        ldev = dev_get_by_index_rcu(net, p->link);
 
                if (unlikely(!ipv6_chk_addr(net, &p->laddr, ldev, 0)))
-                       printk(KERN_WARNING
-                              "%s xmit: Local address not yet configured!\n",
-                              p->name);
+                       pr_warn("%s xmit: Local address not yet configured!\n",
+                               p->name);
                else if (!ipv6_addr_is_multicast(&p->raddr) &&
                         unlikely(ipv6_chk_addr(net, &p->raddr, NULL, 0)))
-                       printk(KERN_WARNING
-                              "%s xmit: Routing loop! "
-                              "Remote address found on this node!\n",
-                              p->name);
+                       pr_warn("%s xmit: Routing loop! Remote address found on this node!\n",
+                               p->name);
                else
                        ret = 1;
                rcu_read_unlock();
@@ -919,10 +909,8 @@ static int ip6_tnl_xmit2(struct sk_buff *skb,
 
        if (tdev == dev) {
                stats->collisions++;
-               if (net_ratelimit())
-                       printk(KERN_WARNING
-                              "%s: Local routing loop detected!\n",
-                              t->parms.name);
+               net_warn_ratelimited("%s: Local routing loop detected!\n",
+                                    t->parms.name);
                goto tx_err_dst_release;
        }
        mtu = dst_mtu(dst) - sizeof (*ipv6h);
@@ -954,7 +942,7 @@ static int ip6_tnl_xmit2(struct sk_buff *skb,
 
                if (skb->sk)
                        skb_set_owner_w(new_skb, skb->sk);
-               kfree_skb(skb);
+               consume_skb(skb);
                skb = new_skb;
        }
        skb_dst_drop(skb);
@@ -1553,13 +1541,13 @@ static int __init ip6_tunnel_init(void)
 
        err = xfrm6_tunnel_register(&ip4ip6_handler, AF_INET);
        if (err < 0) {
-               printk(KERN_ERR "ip6_tunnel init: can't register ip4ip6\n");
+               pr_err("%s: can't register ip4ip6\n", __func__);
                goto out_ip4ip6;
        }
 
        err = xfrm6_tunnel_register(&ip6ip6_handler, AF_INET6);
        if (err < 0) {
-               printk(KERN_ERR "ip6_tunnel init: can't register ip6ip6\n");
+               pr_err("%s: can't register ip6ip6\n", __func__);
                goto out_ip6ip6;
        }
 
@@ -1580,10 +1568,10 @@ out_pernet:
 static void __exit ip6_tunnel_cleanup(void)
 {
        if (xfrm6_tunnel_deregister(&ip4ip6_handler, AF_INET))
-               printk(KERN_INFO "ip6_tunnel close: can't deregister ip4ip6\n");
+               pr_info("%s: can't deregister ip4ip6\n", __func__);
 
        if (xfrm6_tunnel_deregister(&ip6ip6_handler, AF_INET6))
-               printk(KERN_INFO "ip6_tunnel close: can't deregister ip6ip6\n");
+               pr_info("%s: can't deregister ip6ip6\n", __func__);
 
        unregister_pernet_device(&ip6_tnl_net_ops);
 }