netfilter: nf_ct_helper: define pr_fmt()

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index b666959f17c0856f8303fee7467a5e7cc4ff4962..883c691ec8d05724d8a63734bba9a3a30ae06eb2 100644 (file)
--- a/net/netfilter/nf_conntrack_ftp.c
+++ b/net/netfilter/nf_conntrack_ftp.c
@@ -10,6 +10,8 @@
  * published by the Free Software Foundation.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/netfilter.h>
@@ -505,11 +507,11 @@ skip_nl_seq:
                   different IP address.  Simply don't record it for
                   NAT. */
                if (cmd.l3num == PF_INET) {
-                       pr_debug("conntrack_ftp: NOT RECORDING: %pI4 != %pI4\n",
+                       pr_debug("NOT RECORDING: %pI4 != %pI4\n",
                                 &cmd.u3.ip,
                                 &ct->tuplehash[dir].tuple.src.u3.ip);
                } else {
-                       pr_debug("conntrack_ftp: NOT RECORDING: %pI6 != %pI6\n",
+                       pr_debug("NOT RECORDING: %pI6 != %pI6\n",
                                 cmd.u3.ip6,
                                 ct->tuplehash[dir].tuple.src.u3.ip6);
                }
@@ -586,8 +588,7 @@ static void nf_conntrack_ftp_fini(void)
                        if (ftp[i][j].me == NULL)
                                continue;
 
-                       pr_debug("nf_ct_ftp: unregistering helper for pf: %d "
-                                "port: %d\n",
+                       pr_debug("unregistering helper for pf: %d port: %d\n",
                                 ftp[i][j].tuple.src.l3num, ports[i]);
                        nf_conntrack_helper_unregister(&ftp[i][j]);
                }
@@ -625,14 +626,12 @@ static int __init nf_conntrack_ftp_init(void)
                        else
                                sprintf(ftp[i][j].name, "ftp-%d", ports[i]);
 
-                       pr_debug("nf_ct_ftp: registering helper for pf: %d "
-                                "port: %d\n",
+                       pr_debug("registering helper for pf: %d port: %d\n",
                                 ftp[i][j].tuple.src.l3num, ports[i]);
                        ret = nf_conntrack_helper_register(&ftp[i][j]);
                        if (ret) {
-                               printk(KERN_ERR "nf_ct_ftp: failed to register"
-                                      " helper for pf: %d port: %d\n",
-                                       ftp[i][j].tuple.src.l3num, ports[i]);
+                               pr_err("failed to register helper for pf: %d port: %d\n",
+                                      ftp[i][j].tuple.src.l3num, ports[i]);
                                nf_conntrack_ftp_fini();
                                return ret;
                        }

diff --git a/net/netfilter/nf_conntrack_irc.c b/net/netfilter/nf_conntrack_irc.c
index 0fd2976db7ee9a7bdb5db99c912ce707116a8283..8b6da27196005f61d2269d8af92124096c85047e 100644 (file)
--- a/net/netfilter/nf_conntrack_irc.c
+++ b/net/netfilter/nf_conntrack_irc.c
@@ -9,6 +9,8 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/skbuff.h>
@@ -237,7 +239,7 @@ static int __init nf_conntrack_irc_init(void)
        int i, ret;
 
        if (max_dcc_channels < 1) {
-               printk(KERN_ERR "nf_ct_irc: max_dcc_channels must not be zero\n");
+               pr_err("max_dcc_channels must not be zero\n");
                return -EINVAL;
        }
 
@@ -267,8 +269,7 @@ static int __init nf_conntrack_irc_init(void)
 
                ret = nf_conntrack_helper_register(&irc[i]);
                if (ret) {
-                       printk(KERN_ERR "nf_ct_irc: failed to register helper "
-                              "for pf: %u port: %u\n",
+                       pr_err("failed to register helper for pf: %u port: %u\n",
                               irc[i].tuple.src.l3num, ports[i]);
                        nf_conntrack_irc_fini();
                        return ret;

diff --git a/net/netfilter/nf_conntrack_sane.c b/net/netfilter/nf_conntrack_sane.c
index 4a2134fd3fcb8906e9602a75c367f62ad70cd46f..7523a575f6d16ded0c5724156cfe280598c5c505 100644 (file)
--- a/net/netfilter/nf_conntrack_sane.c
+++ b/net/netfilter/nf_conntrack_sane.c
@@ -17,6 +17,8 @@
  * published by the Free Software Foundation.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/netfilter.h>
@@ -120,14 +122,14 @@ static int help(struct sk_buff *skb,
        ct_sane_info->state = SANE_STATE_NORMAL;
 
        if (datalen < sizeof(struct sane_reply_net_start)) {
-               pr_debug("nf_ct_sane: NET_START reply too short\n");
+               pr_debug("NET_START reply too short\n");
                goto out;
        }
 
        reply = sb_ptr;
        if (reply->status != htonl(SANE_STATUS_SUCCESS)) {
                /* saned refused the command */
-               pr_debug("nf_ct_sane: unsuccessful SANE_STATUS = %u\n",
+               pr_debug("unsuccessful SANE_STATUS = %u\n",
                         ntohl(reply->status));
                goto out;
        }
@@ -148,7 +150,7 @@ static int help(struct sk_buff *skb,
                          &tuple->src.u3, &tuple->dst.u3,
                          IPPROTO_TCP, NULL, &reply->port);
 
-       pr_debug("nf_ct_sane: expect: ");
+       pr_debug("expect: ");
        nf_ct_dump_tuple(&exp->tuple);
 
        /* Can't expect this?  Best to drop packet now. */
@@ -178,8 +180,7 @@ static void nf_conntrack_sane_fini(void)
 
        for (i = 0; i < ports_c; i++) {
                for (j = 0; j < 2; j++) {
-                       pr_debug("nf_ct_sane: unregistering helper for pf: %d "
-                                "port: %d\n",
+                       pr_debug("unregistering helper for pf: %d port: %d\n",
                                 sane[i][j].tuple.src.l3num, ports[i]);
                        nf_conntrack_helper_unregister(&sane[i][j]);
                }
@@ -216,14 +217,12 @@ static int __init nf_conntrack_sane_init(void)
                        else
                                sprintf(sane[i][j].name, "sane-%d", ports[i]);
 
-                       pr_debug("nf_ct_sane: registering helper for pf: %d "
-                                "port: %d\n",
+                       pr_debug("registering helper for pf: %d port: %d\n",
                                 sane[i][j].tuple.src.l3num, ports[i]);
                        ret = nf_conntrack_helper_register(&sane[i][j]);
                        if (ret) {
-                               printk(KERN_ERR "nf_ct_sane: failed to "
-                                      "register helper for pf: %d port: %d\n",
-                                       sane[i][j].tuple.src.l3num, ports[i]);
+                               pr_err("failed to register helper for pf: %d port: %d\n",
+                                      sane[i][j].tuple.src.l3num, ports[i]);
                                nf_conntrack_sane_fini();
                                return ret;
                        }

diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c
index 885b4aba369565a8edcf6aaaead9b921d043d2b8..3e06402739e0acfd946fc8de04116aef0feea4ad 100644 (file)
--- a/net/netfilter/nf_conntrack_sip.c
+++ b/net/netfilter/nf_conntrack_sip.c
@@ -10,6 +10,8 @@
  * published by the Free Software Foundation.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/ctype.h>
 #include <linux/skbuff.h>
@@ -1665,8 +1667,7 @@ static int __init nf_conntrack_sip_init(void)
 
                        ret = nf_conntrack_helper_register(&sip[i][j]);
                        if (ret) {
-                               printk(KERN_ERR "nf_ct_sip: failed to register"
-                                      " helper for pf: %u port: %u\n",
+                               pr_err("failed to register helper for pf: %u port: %u\n",
                                       sip[i][j].tuple.src.l3num, ports[i]);
                                nf_conntrack_sip_fini();
                                return ret;

diff --git a/net/netfilter/nf_conntrack_tftp.c b/net/netfilter/nf_conntrack_tftp.c
index e68ab4fbd71fe7e5fd146fae9950983ddcb27e76..36f9640664615bee6a640e11f4f18d1459952a81 100644 (file)
--- a/net/netfilter/nf_conntrack_tftp.c
+++ b/net/netfilter/nf_conntrack_tftp.c
@@ -5,6 +5,8 @@
  * published by the Free Software Foundation.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/in.h>
@@ -138,9 +140,8 @@ static int __init nf_conntrack_tftp_init(void)
 
                        ret = nf_conntrack_helper_register(&tftp[i][j]);
                        if (ret) {
-                               printk(KERN_ERR "nf_ct_tftp: failed to register"
-                                      " helper for pf: %u port: %u\n",
-                                       tftp[i][j].tuple.src.l3num, ports[i]);
+                               pr_err("failed to register helper for pf: %u port: %u\n",
+                                      tftp[i][j].tuple.src.l3num, ports[i]);
                                nf_conntrack_tftp_fini();
                                return ret;
                        }