Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6db9010 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

[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: default avatarStephen Hemminger <stephen.hemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fea86ad8

net/ipv4/fib_frontend.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -47,8 +47,6 @@ 
#include <net/ip_fib.h>

#include <net/ip_fib.h>

#include <net/rtnetlink.h>

#include <net/rtnetlink.h>





#define FFprint(a...) printk(KERN_DEBUG a)



#ifndef CONFIG_IP_MULTIPLE_TABLES

#ifndef CONFIG_IP_MULTIPLE_TABLES





static int __net_init fib4_rules_init(struct net *net)

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) {

	if (ifa->ifa_flags&IFA_F_SECONDARY) {

		prim = inet_ifa_byprefix(in_dev, prefix, mask);

		prim = inet_ifa_byprefix(in_dev, prefix, mask);

		if (prim == NULL) {

		if (prim == NULL) {

			printk(KERN_DEBUG "fib_add_ifaddr: bug: prim == NULL\n");

			printk(KERN_WARNING "fib_add_ifaddr: bug: prim == NULL\n");

			return;

			return;

		}

		}

	}

	}
@@ -753,7 +751,7 @@ static void fib_del_ifaddr(struct in_ifaddr *ifa) 
	else {

	else {

		prim = inet_ifa_byprefix(in_dev, any, ifa->ifa_mask);

		prim = inet_ifa_byprefix(in_dev, any, ifa->ifa_mask);

		if (prim == NULL) {

		if (prim == NULL) {

			printk(KERN_DEBUG "fib_del_ifaddr: bug: prim == NULL\n");

			printk(KERN_WARNING "fib_del_ifaddr: bug: prim == NULL\n");

			return;

			return;

		}

		}

	}

	}

net/ipv4/fib_hash.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -168,7 +168,8 @@ static void fn_rehash_zone(struct fn_zone *fz) 
	new_hashmask = (new_divisor - 1);

	new_hashmask = (new_divisor - 1);





#if RT_CACHE_DEBUG >= 2

#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

#endif





	ht = fz_hash_alloc(new_divisor);

	ht = fz_hash_alloc(new_divisor);

net/ipv4/fib_semantics.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -47,8 +47,6 @@ 




#include "fib_lookup.h"

#include "fib_lookup.h"





#define FSprintk(a...)



static DEFINE_SPINLOCK(fib_info_lock);

static DEFINE_SPINLOCK(fib_info_lock);

static struct hlist_head *fib_info_hash;

static struct hlist_head *fib_info_hash;

static struct hlist_head *fib_info_laddrhash;

static struct hlist_head *fib_info_laddrhash;
@@ -145,7 +143,7 @@ static const struct 
void free_fib_info(struct fib_info *fi)

void free_fib_info(struct fib_info *fi)

{

{

	if (fi->fib_dead == 0) {

	if (fi->fib_dead == 0) {

		printk("Freeing alive fib_info %p\n", fi);

		printk(KERN_WARNING "Freeing alive fib_info %p\n", fi);

		return;

		return;

	}

	}

	change_nexthops(fi) {

	change_nexthops(fi) {
@@ -914,7 +912,8 @@ int fib_semantic_match(struct list_head *head, const struct flowi *flp, 
				continue;

				continue;





			default:

			default:

				printk(KERN_DEBUG "impossible 102\n");

				printk(KERN_WARNING "fib_semantic_match bad type %#x\n",

					fa->fa_type);

				return -EINVAL;

				return -EINVAL;

			}

			}

		}

		}