diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-23 18:52:51 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-23 18:52:51 +0100 |
| commit | 73570314e4fa1605189a32c493fd15eebdc44863 (patch) | |
| tree | 7d36ef1cee1177593b1a45b7619170b5bfa51298 /net | |
| parent | Au1x00: fix crash when trying register_netdev() (diff) | |
| parent | netfilter: xt_limit: fix invalid return code in limit_mt_check() (diff) | |
| download | linux-73570314e4fa1605189a32c493fd15eebdc44863.tar.xz linux-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.c | 2 |
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; |