diff options
author | Joe Perches <joe@perches.com> | 2012-03-11 14:36:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-03-12 02:42:51 -0400 |
commit | 058bd4d2a4ff0aaa4a5381c67e776729d840c785 (patch) | |
tree | 4d1ea864a8740676c7e7c5a03cdaa67fc5f29418 /net/ipv4/tcp_cong.c | |
parent | 43db362d3adda9e0a915ddb9a8d1a41186e19179 (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_cong.c')
-rw-r--r-- | net/ipv4/tcp_cong.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c index fc6d475f488f..67bab75f441f 100644 --- a/net/ipv4/tcp_cong.c +++ b/net/ipv4/tcp_cong.c | |||
@@ -41,18 +41,17 @@ int tcp_register_congestion_control(struct tcp_congestion_ops *ca) | |||
41 | 41 | ||
42 | /* all algorithms must implement ssthresh and cong_avoid ops */ | 42 | /* all algorithms must implement ssthresh and cong_avoid ops */ |
43 | if (!ca->ssthresh || !ca->cong_avoid) { | 43 | if (!ca->ssthresh || !ca->cong_avoid) { |
44 | printk(KERN_ERR "TCP %s does not implement required ops\n", | 44 | pr_err("TCP %s does not implement required ops\n", ca->name); |
45 | ca->name); | ||
46 | return -EINVAL; | 45 | return -EINVAL; |
47 | } | 46 | } |
48 | 47 | ||
49 | spin_lock(&tcp_cong_list_lock); | 48 | spin_lock(&tcp_cong_list_lock); |
50 | if (tcp_ca_find(ca->name)) { | 49 | if (tcp_ca_find(ca->name)) { |
51 | printk(KERN_NOTICE "TCP %s already registered\n", ca->name); | 50 | pr_notice("TCP %s already registered\n", ca->name); |
52 | ret = -EEXIST; | 51 | ret = -EEXIST; |
53 | } else { | 52 | } else { |
54 | list_add_tail_rcu(&ca->list, &tcp_cong_list); | 53 | list_add_tail_rcu(&ca->list, &tcp_cong_list); |
55 | printk(KERN_INFO "TCP %s registered\n", ca->name); | 54 | pr_info("TCP %s registered\n", ca->name); |
56 | } | 55 | } |
57 | spin_unlock(&tcp_cong_list_lock); | 56 | spin_unlock(&tcp_cong_list_lock); |
58 | 57 | ||