aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/fib_trie.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-03-11 14:36:11 -0400
committerDavid S. Miller <davem@davemloft.net>2012-03-12 02:42:51 -0400
commit058bd4d2a4ff0aaa4a5381c67e776729d840c785 (patch)
tree4d1ea864a8740676c7e7c5a03cdaa67fc5f29418 /net/ipv4/fib_trie.c
parent43db362d3adda9e0a915ddb9a8d1a41186e19179 (diff)
net: Convert printks to pr_<level>
Use a more current kernel messaging style. Convert a printk block to print_hex_dump. Coalesce formats, align arguments. Use %s, __func__ instead of embedding function names. Some messages that were prefixed with <foo>_close are now prefixed with <foo>_fini. Some ah4 and esp messages are now not prefixed with "ip ". The intent of this patch is to later add something like #define pr_fmt(fmt) "IPv4: " fmt. to standardize the output messages. Text size is trivially reduced. (x86-32 allyesconfig) $ size net/ipv4/built-in.o* text data bss dec hex filename 887888 31558 249696 1169142 11d6f6 net/ipv4/built-in.o.new 887934 31558 249800 1169292 11d78c net/ipv4/built-in.o.old Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_trie.c')
-rw-r--r--net/ipv4/fib_trie.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 2b555a5521e0..da9b9cb2282d 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -1170,9 +1170,8 @@ static struct list_head *fib_insert_node(struct trie *t, u32 key, int plen)
1170 } 1170 }
1171 1171
1172 if (tp && tp->pos + tp->bits > 32) 1172 if (tp && tp->pos + tp->bits > 32)
1173 pr_warning("fib_trie" 1173 pr_warn("fib_trie tp=%p pos=%d, bits=%d, key=%0x plen=%d\n",
1174 " tp=%p pos=%d, bits=%d, key=%0x plen=%d\n", 1174 tp, tp->pos, tp->bits, key, plen);
1175 tp, tp->pos, tp->bits, key, plen);
1176 1175
1177 /* Rebalance the trie */ 1176 /* Rebalance the trie */
1178 1177