Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / net / ipv4 / tcp_cong.c

diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c
index fc6d475..272a845 100644 (file)
--- a/net/ipv4/tcp_cong.c
+++ b/net/ipv4/tcp_cong.c
@@ -6,6 +6,8 @@
  * Copyright (C) 2005 Stephen Hemminger <shemminger@osdl.org>
  */
 
+#define pr_fmt(fmt) "TCP: " fmt
+
 #include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/types.h>
@@ -41,18 +43,17 @@ int tcp_register_congestion_control(struct tcp_congestion_ops *ca)
 
        /* all algorithms must implement ssthresh and cong_avoid ops */
        if (!ca->ssthresh || !ca->cong_avoid) {
-               printk(KERN_ERR "TCP %s does not implement required ops\n",
-                      ca->name);
+               pr_err("%s does not implement required ops\n", ca->name);
                return -EINVAL;
        }
 
        spin_lock(&tcp_cong_list_lock);
        if (tcp_ca_find(ca->name)) {
-               printk(KERN_NOTICE "TCP %s already registered\n", ca->name);
+               pr_notice("%s already registered\n", ca->name);
                ret = -EEXIST;
        } else {
                list_add_tail_rcu(&ca->list, &tcp_cong_list);
-               printk(KERN_INFO "TCP %s registered\n", ca->name);
+               pr_info("%s registered\n", ca->name);
        }
        spin_unlock(&tcp_cong_list_lock);