aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-11-23 09:52:51 -0800
committerDavid S. Miller <davem@davemloft.net>2009-11-23 09:52:51 -0800
commit73570314e4fa1605189a32c493fd15eebdc44863 (patch)
tree7d36ef1cee1177593b1a45b7619170b5bfa51298 /net
parentAu1x00: fix crash when trying register_netdev() (diff)
parentnetfilter: xt_limit: fix invalid return code in limit_mt_check() (diff)
downloadlinux-dev-73570314e4fa1605189a32c493fd15eebdc44863.tar.xz
linux-dev-73570314e4fa1605189a32c493fd15eebdc44863.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/xt_limit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/xt_limit.c b/net/netfilter/xt_limit.c
index 2e8089ecd0af..2773be6a71dd 100644
--- a/net/netfilter/xt_limit.c
+++ b/net/netfilter/xt_limit.c
@@ -112,7 +112,7 @@ static bool limit_mt_check(const struct xt_mtchk_param *par)
priv = kmalloc(sizeof(*priv), GFP_KERNEL);
if (priv == NULL)
- return -ENOMEM;
+ return false;
/* For SMP, we only want to use one set of state. */
r->master = priv;