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_ipv4.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_ipv4.c')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 507924b640ef..257dba66eaca 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -1227,10 +1227,10 @@ static int tcp_v4_inbound_md5_hash(struct sock *sk, const struct sk_buff *skb) | |||
1227 | 1227 | ||
1228 | if (genhash || memcmp(hash_location, newhash, 16) != 0) { | 1228 | if (genhash || memcmp(hash_location, newhash, 16) != 0) { |
1229 | if (net_ratelimit()) { | 1229 | if (net_ratelimit()) { |
1230 | printk(KERN_INFO "MD5 Hash failed for (%pI4, %d)->(%pI4, %d)%s\n", | 1230 | pr_info("MD5 Hash failed for (%pI4, %d)->(%pI4, %d)%s\n", |
1231 | &iph->saddr, ntohs(th->source), | 1231 | &iph->saddr, ntohs(th->source), |
1232 | &iph->daddr, ntohs(th->dest), | 1232 | &iph->daddr, ntohs(th->dest), |
1233 | genhash ? " tcp_v4_calc_md5_hash failed" : ""); | 1233 | genhash ? " tcp_v4_calc_md5_hash failed" : ""); |
1234 | } | 1234 | } |
1235 | return 1; | 1235 | return 1; |
1236 | } | 1236 | } |