Browse Source

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: Joe Perches <joe@perches.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Joe Perches 10 years ago
parent
commit
a81b2ce850

+ 3 - 1
net/ipv4/netfilter/nf_log_arp.c

@@ -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,
 		},
 		},
 	},
 	},

+ 3 - 1
net/ipv4/netfilter/nf_log_ipv4.c

@@ -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,
 		},
 		},
 	},
 	},

+ 4 - 1
net/ipv6/netfilter/ip6_tables.c

@@ -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,
 		},
 		},
 	},
 	},

+ 3 - 1
net/ipv6/netfilter/nf_log_ipv6.c

@@ -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,
 		},
 		},
 	},
 	},

+ 2 - 1
net/netfilter/nf_tables_core.c

@@ -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,
 	        },
 	        },
 	},
 	},

+ 1 - 1
net/netfilter/nft_log.c

@@ -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 =