[IPV4] FIB: printk related cleanups

printk related cleanups:
 * Get rid of unused printk wrappers.
 * Make bug checks into KERN_WARNING because KERN_DEBUG gets ignored
 * Turn one cryptic old message into something real
 * Make sure all messages have KERN_XXX

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 64421c520a0e470cd70f76227ea56256aba7f483..02b5ff73357fd1b438886d6e84e52646ea9f3c22 100644 (file)
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -47,8 +47,6 @@
 #include <net/ip_fib.h>
 #include <net/rtnetlink.h>
 
-#define FFprint(a...) printk(KERN_DEBUG a)
-
 #ifndef CONFIG_IP_MULTIPLE_TABLES
 
 static int __net_init fib4_rules_init(struct net *net)
@@ -706,7 +704,7 @@ void fib_add_ifaddr(struct in_ifaddr *ifa)
        if (ifa->ifa_flags&IFA_F_SECONDARY) {
                prim = inet_ifa_byprefix(in_dev, prefix, mask);
                if (prim == NULL) {
-                       printk(KERN_DEBUG "fib_add_ifaddr: bug: prim == NULL\n");
+                       printk(KERN_WARNING "fib_add_ifaddr: bug: prim == NULL\n");
                        return;
                }
        }
@@ -753,7 +751,7 @@ static void fib_del_ifaddr(struct in_ifaddr *ifa)
        else {
                prim = inet_ifa_byprefix(in_dev, any, ifa->ifa_mask);
                if (prim == NULL) {
-                       printk(KERN_DEBUG "fib_del_ifaddr: bug: prim == NULL\n");
+                       printk(KERN_WARNING "fib_del_ifaddr: bug: prim == NULL\n");
                        return;
                }
        }

diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c
index a07300404e82f3050047eee1470971fc0421a5aa..258214f57fba0c61ef5f1275bf8ebdbfdb5596b8 100644 (file)
--- a/net/ipv4/fib_hash.c
+++ b/net/ipv4/fib_hash.c
@@ -168,7 +168,8 @@ static void fn_rehash_zone(struct fn_zone *fz)
        new_hashmask = (new_divisor - 1);
 
 #if RT_CACHE_DEBUG >= 2
-       printk("fn_rehash_zone: hash for zone %d grows from %d\n", fz->fz_order, old_divisor);
+       printk(KERN_DEBUG "fn_rehash_zone: hash for zone %d grows from %d\n",
+              fz->fz_order, old_divisor);
 #endif
 
        ht = fz_hash_alloc(new_divisor);

diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index 0de6102020e23668a4c7c3fa35cd6df581f99361..3ed920b92fb67fa7fbc85735c268c4e851b348ed 100644 (file)
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -47,8 +47,6 @@
 
 #include "fib_lookup.h"
 
-#define FSprintk(a...)
-
 static DEFINE_SPINLOCK(fib_info_lock);
 static struct hlist_head *fib_info_hash;
 static struct hlist_head *fib_info_laddrhash;
@@ -145,7 +143,7 @@ static const struct
 void free_fib_info(struct fib_info *fi)
 {
        if (fi->fib_dead == 0) {
-               printk("Freeing alive fib_info %p\n", fi);
+               printk(KERN_WARNING "Freeing alive fib_info %p\n", fi);
                return;
        }
        change_nexthops(fi) {
@@ -914,7 +912,8 @@ int fib_semantic_match(struct list_head *head, const struct flowi *flp,
                                continue;
 
                        default:
-                               printk(KERN_DEBUG "impossible 102\n");
+                               printk(KERN_WARNING "fib_semantic_match bad type %#x\n",
+                                       fa->fa_type);
                                return -EINVAL;
                        }
                }