netfilter: Replace printk() with pr_*() and define pr_fmt()

[linux-2.6-microblaze.git] / net / netfilter / nf_nat_ftp.c

diff --git a/net/netfilter/nf_nat_ftp.c b/net/netfilter/nf_nat_ftp.c
index d76afaf..5063cbf 100644 (file)
--- a/net/netfilter/nf_nat_ftp.c
+++ b/net/netfilter/nf_nat_ftp.c
@@ -8,6 +8,8 @@
  * published by the Free Software Foundation.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/inet.h>
@@ -71,7 +73,7 @@ static unsigned int nf_nat_ftp(struct sk_buff *skb,
        char buffer[sizeof("|1||65535|") + INET6_ADDRSTRLEN];
        unsigned int buflen;
 
-       pr_debug("FTP_NAT: type %i, off %u len %u\n", type, matchoff, matchlen);
+       pr_debug("type %i, off %u len %u\n", type, matchoff, matchlen);
 
        /* Connection will come from wherever this packet goes, hence !dir */
        newaddr = ct->tuplehash[!dir].tuple.dst.u3;
@@ -136,8 +138,7 @@ static int __init nf_nat_ftp_init(void)
 /* Prior to 2.6.11, we had a ports param.  No longer, but don't break users. */
 static int warn_set(const char *val, const struct kernel_param *kp)
 {
-       printk(KERN_INFO KBUILD_MODNAME
-              ": kernel >= 2.6.10 only uses 'ports' for conntrack modules\n");
+       pr_info("kernel >= 2.6.10 only uses 'ports' for conntrack modules\n");
        return 0;
 }
 module_param_call(ports, warn_set, NULL, NULL, 0);