diff options
author | David S. Miller <davem@davemloft.net> | 2009-11-23 17:52:51 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-23 17:52:51 (GMT) |
commit | 73570314e4fa1605189a32c493fd15eebdc44863 (patch) | |
tree | 7d36ef1cee1177593b1a45b7619170b5bfa51298 /net | |
parent | 63edaf647607795a065e6956a79c47f500dc8447 (diff) | |
parent | 8fa539bd911e8a7faa7cd77b5192229c9666d9b8 (diff) | |
download | linux-fsl-qoriq-73570314e4fa1605189a32c493fd15eebdc44863.tar.xz |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/xt_limit.c b/net/netfilter/xt_limit.c index 2e8089e..2773be6 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; |