aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-03-12 03:03:32 -0400
committerDavid S. Miller <davem@davemloft.net>2012-03-12 20:05:21 -0400
commitafd465030acb4098abcb6b965a5aebc7ea2209e0 (patch)
tree59c93e8eda99cd59339dfbb77f1d2c4f79c634ee /net/ipv4/tcp.c
parent058bd4d2a4ff0aaa4a5381c67e776729d840c785 (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.c')
-rw-r--r--net/ipv4/tcp.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 2baba1bed810..cfd7edda0a8e 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -245,6 +245,8 @@
245 * TCP_CLOSE socket is finished 245 * TCP_CLOSE socket is finished
246 */ 246 */
247 247
248#define pr_fmt(fmt) "TCP: " fmt
249
248#include <linux/kernel.h> 250#include <linux/kernel.h>
249#include <linux/module.h> 251#include <linux/module.h>
250#include <linux/types.h> 252#include <linux/types.h>
@@ -1675,7 +1677,8 @@ do_prequeue:
1675 1677
1676 if (tp->ucopy.dma_cookie < 0) { 1678 if (tp->ucopy.dma_cookie < 0) {
1677 1679
1678 pr_alert("dma_cookie < 0\n"); 1680 pr_alert("%s: dma_cookie < 0\n",
1681 __func__);
1679 1682
1680 /* Exception. Bailout! */ 1683 /* Exception. Bailout! */
1681 if (!copied) 1684 if (!copied)
@@ -1884,9 +1887,9 @@ bool tcp_check_oom(struct sock *sk, int shift)
1884 out_of_socket_memory = tcp_out_of_memory(sk); 1887 out_of_socket_memory = tcp_out_of_memory(sk);
1885 1888
1886 if (too_many_orphans && net_ratelimit()) 1889 if (too_many_orphans && net_ratelimit())
1887 pr_info("TCP: too many orphaned sockets\n"); 1890 pr_info("too many orphaned sockets\n");
1888 if (out_of_socket_memory && net_ratelimit()) 1891 if (out_of_socket_memory && net_ratelimit())
1889 pr_info("TCP: out of memory -- consider tuning tcp_mem\n"); 1892 pr_info("out of memory -- consider tuning tcp_mem\n");
1890 return too_many_orphans || out_of_socket_memory; 1893 return too_many_orphans || out_of_socket_memory;
1891} 1894}
1892 1895
@@ -3311,7 +3314,7 @@ void __init tcp_init(void)
3311 sysctl_tcp_rmem[1] = 87380; 3314 sysctl_tcp_rmem[1] = 87380;
3312 sysctl_tcp_rmem[2] = max(87380, max_share); 3315 sysctl_tcp_rmem[2] = max(87380, max_share);
3313 3316
3314 pr_info("TCP: Hash tables configured (established %u bind %u)\n", 3317 pr_info("Hash tables configured (established %u bind %u)\n",
3315 tcp_hashinfo.ehash_mask + 1, tcp_hashinfo.bhash_size); 3318 tcp_hashinfo.ehash_mask + 1, tcp_hashinfo.bhash_size);
3316 3319
3317 tcp_register_congestion_control(&tcp_reno); 3320 tcp_register_congestion_control(&tcp_reno);