forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
netfilter: xt extensions: use pr_<level>
Signed-off-by: Jan Engelhardt <[email protected]>
- Loading branch information
Jan Engelhardt
committed
Mar 18, 2010
1 parent
be91fd5
commit 8bee4ba
Showing
21 changed files
with
88 additions
and
107 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,15 +15,14 @@ | |
* published by the Free Software Foundation. | ||
* | ||
*/ | ||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
#include <linux/module.h> | ||
#include <linux/skbuff.h> | ||
#include <linux/netfilter/x_tables.h> | ||
#include <linux/netfilter/xt_CONNSECMARK.h> | ||
#include <net/netfilter/nf_conntrack.h> | ||
#include <net/netfilter/nf_conntrack_ecache.h> | ||
|
||
#define PFX "CONNSECMARK: " | ||
|
||
MODULE_LICENSE("GPL"); | ||
MODULE_AUTHOR("James Morris <[email protected]>"); | ||
MODULE_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) | |
|
||
if (strcmp(par->table, "mangle") != 0 && | ||
strcmp(par->table, "security") != 0) { | ||
printk(KERN_INFO PFX "target only valid in the \'mangle\' " | ||
"or \'security\' tables, not \'%s\'.\n", par->table); | ||
pr_info("target only valid in the \'mangle\' " | ||
"or \'security\' tables, not \'%s\'.\n", par->table); | ||
return false; | ||
} | ||
|
||
|
@@ -102,13 +101,13 @@ static bool connsecmark_tg_check(const struct xt_tgchk_param *par) | |
break; | ||
|
||
default: | ||
printk(KERN_INFO PFX "invalid mode: %hu\n", info->mode); | ||
pr_info("invalid mode: %hu\n", info->mode); | ||
return false; | ||
} | ||
|
||
if (nf_ct_l3proto_try_module_get(par->family) < 0) { | ||
printk(KERN_WARNING "can't load conntrack support for " | ||
"proto=%u\n", par->family); | ||
pr_info("cannot load conntrack support for proto=%u\n", | ||
par->family); | ||
return false; | ||
} | ||
return true; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
/* Kernel module to match connection tracking byte counter. | ||
* GPL (C) 2002 Martin Devera ([email protected]). | ||
*/ | ||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
#include <linux/module.h> | ||
#include <linux/bitops.h> | ||
#include <linux/skbuff.h> | ||
|
@@ -107,8 +108,8 @@ static bool connbytes_mt_check(const struct xt_mtchk_param *par) | |
return false; | ||
|
||
if (nf_ct_l3proto_try_module_get(par->family) < 0) { | ||
printk(KERN_WARNING "can't load conntrack support for " | ||
"proto=%u\n", par->family); | ||
pr_info("cannot load conntrack support for proto=%u\n", | ||
par->family); | ||
return false; | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,6 +11,7 @@ | |
* Kernel module to match connection tracking information. | ||
* GPL (C) 1999 Rusty Russell ([email protected]). | ||
*/ | ||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
#include <linux/in.h> | ||
#include <linux/in6.h> | ||
#include <linux/ip.h> | ||
|
@@ -225,8 +226,8 @@ static bool connlimit_mt_check(const struct xt_mtchk_param *par) | |
connlimit_rnd_inited = true; | ||
} | ||
if (nf_ct_l3proto_try_module_get(par->family) < 0) { | ||
printk(KERN_WARNING "cannot load conntrack support for " | ||
"address family %u\n", par->family); | ||
pr_info("cannot load conntrack support for " | ||
"address family %u\n", par->family); | ||
return false; | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.