aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/xt_CONNSECMARK.c
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2010-03-17 11:04:40 -0400
committerJan Engelhardt <jengelh@medozas.de>2010-03-18 09:20:07 -0400
commit8bee4bad03c5b601bd6cea123c31025680587ccc (patch)
treed3eb075492251d8ee16ac1282722b7fa66f9368c /net/netfilter/xt_CONNSECMARK.c
parentbe91fd5e323b46450ca82f6828e933e3791fb2f2 (diff)
netfilter: xt extensions: use pr_<level>
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'net/netfilter/xt_CONNSECMARK.c')
-rw-r--r--net/netfilter/xt_CONNSECMARK.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/net/netfilter/xt_CONNSECMARK.c b/net/netfilter/xt_CONNSECMARK.c
index b54c3756fdc..6812865488d 100644
--- a/net/netfilter/xt_CONNSECMARK.c
+++ b/net/netfilter/xt_CONNSECMARK.c
@@ -15,6 +15,7 @@
15 * published by the Free Software Foundation. 15 * published by the Free Software Foundation.
16 * 16 *
17 */ 17 */
18#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
18#include <linux/module.h> 19#include <linux/module.h>
19#include <linux/skbuff.h> 20#include <linux/skbuff.h>
20#include <linux/netfilter/x_tables.h> 21#include <linux/netfilter/x_tables.h>
@@ -22,8 +23,6 @@
22#include <net/netfilter/nf_conntrack.h> 23#include <net/netfilter/nf_conntrack.h>
23#include <net/netfilter/nf_conntrack_ecache.h> 24#include <net/netfilter/nf_conntrack_ecache.h>
24 25
25#define PFX "CONNSECMARK: "
26
27MODULE_LICENSE("GPL"); 26MODULE_LICENSE("GPL");
28MODULE_AUTHOR("James Morris <jmorris@redhat.com>"); 27MODULE_AUTHOR("James Morris <jmorris@redhat.com>");
29MODULE_DESCRIPTION("Xtables: target for copying between connection and security mark"); 28MODULE_DESCRIPTION("Xtables: target for copying between connection and security mark");
@@ -91,8 +90,8 @@ static bool connsecmark_tg_check(const struct xt_tgchk_param *par)
91 90
92 if (strcmp(par->table, "mangle") != 0 && 91 if (strcmp(par->table, "mangle") != 0 &&
93 strcmp(par->table, "security") != 0) { 92 strcmp(par->table, "security") != 0) {
94 printk(KERN_INFO PFX "target only valid in the \'mangle\' " 93 pr_info("target only valid in the \'mangle\' "
95 "or \'security\' tables, not \'%s\'.\n", par->table); 94 "or \'security\' tables, not \'%s\'.\n", par->table);
96 return false; 95 return false;
97 } 96 }
98 97
@@ -102,13 +101,13 @@ static bool connsecmark_tg_check(const struct xt_tgchk_param *par)
102 break; 101 break;
103 102
104 default: 103 default:
105 printk(KERN_INFO PFX "invalid mode: %hu\n", info->mode); 104 pr_info("invalid mode: %hu\n", info->mode);
106 return false; 105 return false;
107 } 106 }
108 107
109 if (nf_ct_l3proto_try_module_get(par->family) < 0) { 108 if (nf_ct_l3proto_try_module_get(par->family) < 0) {
110 printk(KERN_WARNING "can't load conntrack support for " 109 pr_info("cannot load conntrack support for proto=%u\n",
111 "proto=%u\n", par->family); 110 par->family);
112 return false; 111 return false;
113 } 112 }
114 return true; 113 return true;