forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

netfilter: Use LOGLEVEL_<FOO> defines

Browse source 
Use the #defines where appropriate.

Miscellanea:

Add explicit #include <linux/kernel.h> where it was not
previously used so that these #defines are a bit more
explicitly defined instead of indirectly included via:
	module.h->moduleparam.h->kernel.h

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Joe Perches 2015-03-23 11:50:10 -07:00 • committed by Pablo Neira Ayuso
parent 5ebb335dcb
commit a81b2ce850
6 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
net/ipv4/netfilter/nf_log_arp.c
View file

@ -10,8 +10,10 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
@ -27,7 +29,7 @@ static struct nf_loginfo default_loginfo = {
.type = NF_LOG_TYPE_LOG, .type = NF_LOG_TYPE_LOG,
.u = { .u = {
.log = { .log = {
.level = 5, .level = LOGLEVEL_NOTICE,
.logflags = NF_LOG_MASK, .logflags = NF_LOG_MASK,
}, },
}, },

4
net/ipv4/netfilter/nf_log_ipv4.c
View file

@ -5,8 +5,10 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
@ -26,7 +28,7 @@ static struct nf_loginfo default_loginfo = {
.type = NF_LOG_TYPE_LOG, .type = NF_LOG_TYPE_LOG,
.u = { .u = {
.log = { .log = {
.level = 5, .level = LOGLEVEL_NOTICE,
.logflags = NF_LOG_MASK, .logflags = NF_LOG_MASK,
}, },
}, },

5
net/ipv6/netfilter/ip6_tables.c
View file

@ -9,7 +9,10 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h>
#include <linux/capability.h> #include <linux/capability.h>
#include <linux/in.h> #include <linux/in.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
@ -234,7 +237,7 @@ static struct nf_loginfo trace_loginfo = {
.type = NF_LOG_TYPE_LOG, .type = NF_LOG_TYPE_LOG,
.u = { .u = {
.log = { .log = {
.level = 4, .level = LOGLEVEL_WARNING,
.logflags = NF_LOG_MASK, .logflags = NF_LOG_MASK,
}, },
}, },

4
net/ipv6/netfilter/nf_log_ipv6.c
View file

@ -5,8 +5,10 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
@ -27,7 +29,7 @@ static struct nf_loginfo default_loginfo = {
.type = NF_LOG_TYPE_LOG, .type = NF_LOG_TYPE_LOG,
.u = { .u = {
.log = { .log = {
.level = 5, .level = LOGLEVEL_NOTICE,
.logflags = NF_LOG_MASK, .logflags = NF_LOG_MASK,
}, },
}, },

3
net/netfilter/nf_tables_core.c
View file

@ -8,6 +8,7 @@
* Development of this code funded by Astaro AG (http://www.astaro.com/) * Development of this code funded by Astaro AG (http://www.astaro.com/)
*/ */
#include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/list.h> #include <linux/list.h>
@ -37,7 +38,7 @@ static struct nf_loginfo trace_loginfo = {
.type = NF_LOG_TYPE_LOG, .type = NF_LOG_TYPE_LOG,
.u = { .u = {
.log = { .log = {
.level = 4, .level = LOGLEVEL_WARNING,
.logflags = NF_LOG_MASK, .logflags = NF_LOG_MASK,
}, },
}, },

2
net/netfilter/nft_log.c
View file

@ -78,7 +78,7 @@ static int nft_log_init(const struct nft_ctx *ctx,
li->u.log.level = li->u.log.level =
ntohl(nla_get_be32(tb[NFTA_LOG_LEVEL])); ntohl(nla_get_be32(tb[NFTA_LOG_LEVEL]));
} else { } else {
li->u.log.level = 4; li->u.log.level = LOGLEVEL_WARNING;
} }
if (tb[NFTA_LOG_FLAGS] != NULL) { if (tb[NFTA_LOG_FLAGS] != NULL) {
li->u.log.logflags = li->u.log.logflags =