aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/fib_frontend.c6
-rw-r--r--net/ipv4/fib_hash.c3
-rw-r--r--net/ipv4/fib_semantics.c7
3 files changed, 7 insertions, 9 deletions
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 64421c520a0e..02b5ff73357f 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -47,8 +47,6 @@
47#include <net/ip_fib.h> 47#include <net/ip_fib.h>
48#include <net/rtnetlink.h> 48#include <net/rtnetlink.h>
49 49
50#define FFprint(a...) printk(KERN_DEBUG a)
51
52#ifndef CONFIG_IP_MULTIPLE_TABLES 50#ifndef CONFIG_IP_MULTIPLE_TABLES
53 51
54static int __net_init fib4_rules_init(struct net *net) 52static int __net_init fib4_rules_init(struct net *net)
@@ -706,7 +704,7 @@ void fib_add_ifaddr(struct in_ifaddr *ifa)
706 if (ifa->ifa_flags&IFA_F_SECONDARY) { 704 if (ifa->ifa_flags&IFA_F_SECONDARY) {
707 prim = inet_ifa_byprefix(in_dev, prefix, mask); 705 prim = inet_ifa_byprefix(in_dev, prefix, mask);
708 if (prim == NULL) { 706 if (prim == NULL) {
709 printk(KERN_DEBUG "fib_add_ifaddr: bug: prim == NULL\n"); 707 printk(KERN_WARNING "fib_add_ifaddr: bug: prim == NULL\n");
710 return; 708 return;
711 } 709 }
712 } 710 }
@@ -753,7 +751,7 @@ static void fib_del_ifaddr(struct in_ifaddr *ifa)
753 else { 751 else {
754 prim = inet_ifa_byprefix(in_dev, any, ifa->ifa_mask); 752 prim = inet_ifa_byprefix(in_dev, any, ifa->ifa_mask);
755 if (prim == NULL) { 753 if (prim == NULL) {
756 printk(KERN_DEBUG "fib_del_ifaddr: bug: prim == NULL\n"); 754 printk(KERN_WARNING "fib_del_ifaddr: bug: prim == NULL\n");
757 return; 755 return;
758 } 756 }
759 } 757 }
diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c
index a07300404e82..258214f57fba 100644
--- 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)
168 new_hashmask = (new_divisor - 1); 168 new_hashmask = (new_divisor - 1);
169 169
170#if RT_CACHE_DEBUG >= 2 170#if RT_CACHE_DEBUG >= 2
171 printk("fn_rehash_zone: hash for zone %d grows from %d\n", fz->fz_order, old_divisor); 171 printk(KERN_DEBUG "fn_rehash_zone: hash for zone %d grows from %d\n",
172 fz->fz_order, old_divisor);
172#endif 173#endif
173 174
174 ht = fz_hash_alloc(new_divisor); 175 ht = fz_hash_alloc(new_divisor);
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index 0de6102020e2..3ed920b92fb6 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -47,8 +47,6 @@
47 47
48#include "fib_lookup.h" 48#include "fib_lookup.h"
49 49
50#define FSprintk(a...)
51
52static DEFINE_SPINLOCK(fib_info_lock); 50static DEFINE_SPINLOCK(fib_info_lock);
53static struct hlist_head *fib_info_hash; 51static struct hlist_head *fib_info_hash;
54static struct hlist_head *fib_info_laddrhash; 52static struct hlist_head *fib_info_laddrhash;
@@ -145,7 +143,7 @@ static const struct
145void free_fib_info(struct fib_info *fi) 143void free_fib_info(struct fib_info *fi)
146{ 144{
147 if (fi->fib_dead == 0) { 145 if (fi->fib_dead == 0) {
148 printk("Freeing alive fib_info %p\n", fi); 146 printk(KERN_WARNING "Freeing alive fib_info %p\n", fi);
149 return; 147 return;
150 } 148 }
151 change_nexthops(fi) { 149 change_nexthops(fi) {
@@ -914,7 +912,8 @@ int fib_semantic_match(struct list_head *head, const struct flowi *flp,
914 continue; 912 continue;
915 913
916 default: 914 default:
917 printk(KERN_DEBUG "impossible 102\n"); 915 printk(KERN_WARNING "fib_semantic_match bad type %#x\n",
916 fa->fa_type);
918 return -EINVAL; 917 return -EINVAL;
919 } 918 }
920 } 919 }