Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a81b2ce8 authored by Joe Perches's avatar Joe Perches Committed by Pablo Neira Ayuso
Browse files

netfilter: Use LOGLEVEL_<FOO> defines 



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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 5ebb335d

net/ipv4/netfilter/nf_log_arp.c

+3 −1
Original line number Diff line number Diff line
@@ -10,8 +10,10 @@ 
 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/spinlock.h>

#include <linux/skbuff.h>
@@ -27,7 +29,7 @@ static struct nf_loginfo default_loginfo = { 
	.type	= NF_LOG_TYPE_LOG,

	.u = {

		.log = {

			.level	  = 5,

			.level	  = LOGLEVEL_NOTICE,

			.logflags = NF_LOG_MASK,

		},

	},

net/ipv4/netfilter/nf_log_ipv4.c

+3 −1
Original line number Diff line number Diff line
@@ -5,8 +5,10 @@ 
 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/spinlock.h>

#include <linux/skbuff.h>
@@ -26,7 +28,7 @@ static struct nf_loginfo default_loginfo = { 
	.type	= NF_LOG_TYPE_LOG,

	.u = {

		.log = {

			.level	  = 5,

			.level	  = LOGLEVEL_NOTICE,

			.logflags = NF_LOG_MASK,

		},

	},

net/ipv6/netfilter/ip6_tables.c

+4 −1
Original line number Diff line number Diff line
@@ -9,7 +9,10 @@ 
 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/kernel.h>

#include <linux/capability.h>

#include <linux/in.h>

#include <linux/skbuff.h>
@@ -234,7 +237,7 @@ static struct nf_loginfo trace_loginfo = { 
	.type = NF_LOG_TYPE_LOG,

	.u = {

		.log = {

			.level = 4,

			.level = LOGLEVEL_WARNING,

			.logflags = NF_LOG_MASK,

		},

	},

net/ipv6/netfilter/nf_log_ipv6.c

+3 −1
Original line number Diff line number Diff line
@@ -5,8 +5,10 @@ 
 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/spinlock.h>

#include <linux/skbuff.h>
@@ -27,7 +29,7 @@ static struct nf_loginfo default_loginfo = { 
	.type	= NF_LOG_TYPE_LOG,

	.u = {

		.log = {

			.level	  = 5,

			.level	  = LOGLEVEL_NOTICE,

			.logflags = NF_LOG_MASK,

		},

	},

net/netfilter/nf_tables_core.c

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Development of this code funded by Astaro AG (http://www.astaro.com/)

 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/list.h>
@@ -37,7 +38,7 @@ static struct nf_loginfo trace_loginfo = { 
	.type = NF_LOG_TYPE_LOG,

	.u = {

		.log = {

			.level = 4,

			.level = LOGLEVEL_WARNING,

			.logflags = NF_LOG_MASK,

	        },

	},