diff options
author | Joe Perches <joe@perches.com> | 2012-03-12 03:03:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-03-12 20:05:21 -0400 |
commit | afd465030acb4098abcb6b965a5aebc7ea2209e0 (patch) | |
tree | 59c93e8eda99cd59339dfbb77f1d2c4f79c634ee /net/ipv4/tcp_ipv4.c | |
parent | 058bd4d2a4ff0aaa4a5381c67e776729d840c785 (diff) |
net: ipv4: Standardize prefixes for message logging
Add #define pr_fmt(fmt) as appropriate.
Add "IPv4: ", "TCP: ", and "IPsec: " to appropriate files.
Standardize on "UDPLite: " for appropriate uses.
Some prefixes were previously "UDPLITE: " and "UDP-Lite: ".
Add KBUILD_MODNAME ": " to icmp and gre.
Remove embedded prefixes as appropriate.
Add missing "\n" to pr_info in gre.c.
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 257dba66eaca..fe9f604ed1e2 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -50,6 +50,7 @@ | |||
50 | * a single port at the same time. | 50 | * a single port at the same time. |
51 | */ | 51 | */ |
52 | 52 | ||
53 | #define pr_fmt(fmt) "TCP: " fmt | ||
53 | 54 | ||
54 | #include <linux/bottom_half.h> | 55 | #include <linux/bottom_half.h> |
55 | #include <linux/types.h> | 56 | #include <linux/types.h> |
@@ -876,8 +877,7 @@ int tcp_syn_flood_action(struct sock *sk, | |||
876 | lopt = inet_csk(sk)->icsk_accept_queue.listen_opt; | 877 | lopt = inet_csk(sk)->icsk_accept_queue.listen_opt; |
877 | if (!lopt->synflood_warned) { | 878 | if (!lopt->synflood_warned) { |
878 | lopt->synflood_warned = 1; | 879 | lopt->synflood_warned = 1; |
879 | pr_info("%s: Possible SYN flooding on port %d. %s. " | 880 | pr_info("%s: Possible SYN flooding on port %d. %s. Check SNMP counters.\n", |
880 | " Check SNMP counters.\n", | ||
881 | proto, ntohs(tcp_hdr(skb)->dest), msg); | 881 | proto, ntohs(tcp_hdr(skb)->dest), msg); |
882 | } | 882 | } |
883 | return want_cookie; | 883 | return want_cookie; |
@@ -1399,7 +1399,7 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb) | |||
1399 | * to destinations, already remembered | 1399 | * to destinations, already remembered |
1400 | * to the moment of synflood. | 1400 | * to the moment of synflood. |
1401 | */ | 1401 | */ |
1402 | LIMIT_NETDEBUG(KERN_DEBUG "TCP: drop open request from %pI4/%u\n", | 1402 | LIMIT_NETDEBUG(KERN_DEBUG pr_fmt("drop open request from %pI4/%u\n"), |
1403 | &saddr, ntohs(tcp_hdr(skb)->source)); | 1403 | &saddr, ntohs(tcp_hdr(skb)->source)); |
1404 | goto drop_and_release; | 1404 | goto drop_and_release; |
1405 | } | 1405 | } |