aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp.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/tcp.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/tcp.c')
-rw-r--r--net/ipv4/tcp.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 22ef5f9fd2ff..2baba1bed810 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1675,7 +1675,7 @@ do_prequeue:
1675 1675
1676 if (tp->ucopy.dma_cookie < 0) { 1676 if (tp->ucopy.dma_cookie < 0) {
1677 1677
1678 printk(KERN_ALERT "dma_cookie < 0\n"); 1678 pr_alert("dma_cookie < 0\n");
1679 1679
1680 /* Exception. Bailout! */ 1680 /* Exception. Bailout! */
1681 if (!copied) 1681 if (!copied)
@@ -3311,9 +3311,8 @@ void __init tcp_init(void)
3311 sysctl_tcp_rmem[1] = 87380; 3311 sysctl_tcp_rmem[1] = 87380;
3312 sysctl_tcp_rmem[2] = max(87380, max_share); 3312 sysctl_tcp_rmem[2] = max(87380, max_share);
3313 3313
3314 printk(KERN_INFO "TCP: Hash tables configured " 3314 pr_info("TCP: Hash tables configured (established %u bind %u)\n",
3315 "(established %u bind %u)\n", 3315 tcp_hashinfo.ehash_mask + 1, tcp_hashinfo.bhash_size);
3316 tcp_hashinfo.ehash_mask + 1, tcp_hashinfo.bhash_size);
3317 3316
3318 tcp_register_congestion_control(&tcp_reno); 3317 tcp_register_congestion_control(&tcp_reno);
3319 3318