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
---
net/ipv4/fib_frontend.c | 6 ++----
net/ipv4/fib_hash.c | 3 ++-
net/ipv4/fib_semantics.c | 7 +++----
3 files changed, 7 insertions(+), 9 deletions(-)
--- a/net/ipv4/fib_frontend.c 2008-01-11 21:56:47.000000000 -0800
+++ b/net/ipv4/fib_frontend.c 2008-01-11 22:05:09.000000000 -0800
@@ -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 *if
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_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;
}
}
--- a/net/ipv4/fib_hash.c 2008-01-11 21:56:47.000000000 -0800
+++ b/net/ipv4/fib_hash.c 2008-01-11 22:04:45.000000000 -0800
@@ -168,7 +168,8 @@ static void fn_rehash_zone(struct fn_zon
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);
--- a/net/ipv4/fib_semantics.c 2008-01-11 21:56:47.000000000 -0800
+++ b/net/ipv4/fib_semantics.c 2008-01-11 22:04:45.000000000 -0800
@@ -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
continue;
default:
- printk(KERN_DEBUG "impossible 102\n");
+ printk(KERN_WARNING "fib_semantic_match bad
type %#x\n",
+ fa->fa_type);
return -EINVAL;
}
}
--
Stephen Hemminger <[EMAIL PROTECTED]>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
