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_input.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_input.c')
-rw-r--r-- | net/ipv4/tcp_input.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index b5e315f1364..23ca3663d1e 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -3867,9 +3867,9 @@ void tcp_parse_options(const struct sk_buff *skb, struct tcp_options_received *o | |||
3867 | opt_rx->wscale_ok = 1; | 3867 | opt_rx->wscale_ok = 1; |
3868 | if (snd_wscale > 14) { | 3868 | if (snd_wscale > 14) { |
3869 | if (net_ratelimit()) | 3869 | if (net_ratelimit()) |
3870 | printk(KERN_INFO "tcp_parse_options: Illegal window " | 3870 | pr_info("%s: Illegal window scaling value %d >14 received\n", |
3871 | "scaling value %d >14 received.\n", | 3871 | __func__, |
3872 | snd_wscale); | 3872 | snd_wscale); |
3873 | snd_wscale = 14; | 3873 | snd_wscale = 14; |
3874 | } | 3874 | } |
3875 | opt_rx->snd_wscale = snd_wscale; | 3875 | opt_rx->snd_wscale = snd_wscale; |
@@ -4191,7 +4191,7 @@ static void tcp_fin(struct sock *sk) | |||
4191 | /* Only TCP_LISTEN and TCP_CLOSE are left, in these | 4191 | /* Only TCP_LISTEN and TCP_CLOSE are left, in these |
4192 | * cases we should never reach this piece of code. | 4192 | * cases we should never reach this piece of code. |
4193 | */ | 4193 | */ |
4194 | printk(KERN_ERR "%s: Impossible, sk->sk_state=%d\n", | 4194 | pr_err("%s: Impossible, sk->sk_state=%d\n", |
4195 | __func__, sk->sk_state); | 4195 | __func__, sk->sk_state); |
4196 | break; | 4196 | break; |
4197 | } | 4197 | } |