aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-02-02 15:52:23 -0800
committerDavid S. Miller <davem@davemloft.net>2011-02-02 15:52:23 -0800
commit0bc0be7f20efea664b7c4c1d0b1822bc8f53a8b4 (patch)
treeead6485944f5c1db64c9f6b6dd7ef0f9e4842a67 /net/ipv4
parenttcp_ecn is an integer not a boolean (diff)
parentnetfilter: ecache: always set events bits, filter them later (diff)
downloadlinux-dev-0bc0be7f20efea664b7c4c1d0b1822bc8f53a8b4.tar.xz
linux-dev-0bc0be7f20efea664b7c4c1d0b1822bc8f53a8b4.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/netfilter/arpt_mangle.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/netfilter/arpt_mangle.c b/net/ipv4/netfilter/arpt_mangle.c
index b8ddcc480ed9..a5e52a9f0a12 100644
--- a/net/ipv4/netfilter/arpt_mangle.c
+++ b/net/ipv4/netfilter/arpt_mangle.c
@@ -60,12 +60,12 @@ static int checkentry(const struct xt_tgchk_param *par)
if (mangle->flags & ~ARPT_MANGLE_MASK ||
!(mangle->flags & ARPT_MANGLE_MASK))
- return false;
+ return -EINVAL;
if (mangle->target != NF_DROP && mangle->target != NF_ACCEPT &&
mangle->target != XT_CONTINUE)
- return false;
- return true;
+ return -EINVAL;
+ return 0;
}
static struct xt_target arpt_mangle_reg __read_mostly = {