git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netfilter: ipt_LOG/ip6t_LOG: use more appropriate log level as default
[pandora-kernel.git]
/
net
/
ipv6
/
netfilter
/
ip6t_LOG.c
diff --git
a/net/ipv6/netfilter/ip6t_LOG.c
b/net/ipv6/netfilter/ip6t_LOG.c
index
b285fdf
..
1f47a52
100644
(file)
--- a/
net/ipv6/netfilter/ip6t_LOG.c
+++ b/
net/ipv6/netfilter/ip6t_LOG.c
@@
-9,9
+9,8
@@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
* 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/module.h>
#include <linux/module.h>
-#include <linux/moduleparam.h>
#include <linux/skbuff.h>
#include <linux/if_arp.h>
#include <linux/ip.h>
#include <linux/skbuff.h>
#include <linux/if_arp.h>
#include <linux/ip.h>
@@
-378,7
+377,7
@@
static struct nf_loginfo default_loginfo = {
.type = NF_LOG_TYPE_LOG,
.u = {
.log = {
.type = NF_LOG_TYPE_LOG,
.u = {
.log = {
- .level =
0
,
+ .level =
5
,
.logflags = NF_LOG_MASK,
},
},
.logflags = NF_LOG_MASK,
},
},
@@
-452,20
+451,19
@@
log_tg6(struct sk_buff *skb, const struct xt_target_param *par)
}
}
-static
bool
log_tg6_check(const struct xt_tgchk_param *par)
+static
int
log_tg6_check(const struct xt_tgchk_param *par)
{
const struct ip6t_log_info *loginfo = par->targinfo;
if (loginfo->level >= 8) {
{
const struct ip6t_log_info *loginfo = par->targinfo;
if (loginfo->level >= 8) {
- pr_debug("
LOG:
level %u >= 8\n", loginfo->level);
- return
false
;
+ pr_debug("level %u >= 8\n", loginfo->level);
+ return
-EINVAL
;
}
if (loginfo->prefix[sizeof(loginfo->prefix)-1] != '\0') {
}
if (loginfo->prefix[sizeof(loginfo->prefix)-1] != '\0') {
- pr_debug("LOG: prefix term %i\n",
- loginfo->prefix[sizeof(loginfo->prefix)-1]);
- return false;
+ pr_debug("prefix not null-terminated\n");
+ return -EINVAL;
}
}
- return
true
;
+ return
0
;
}
static struct xt_target log_tg6_reg __read_mostly = {
}
static struct xt_target log_tg6_reg __read_mostly = {