diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-23 12:52:51 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-23 12:52:51 -0500 |
| commit | 73570314e4fa1605189a32c493fd15eebdc44863 (patch) | |
| tree | 7d36ef1cee1177593b1a45b7619170b5bfa51298 /net | |
| parent | 63edaf647607795a065e6956a79c47f500dc8447 (diff) | |
| parent | 8fa539bd911e8a7faa7cd77b5192229c9666d9b8 (diff) | |
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) | |||
| 112 | 112 | ||
| 113 | priv = kmalloc(sizeof(*priv), GFP_KERNEL); | 113 | priv = kmalloc(sizeof(*priv), GFP_KERNEL); |
| 114 | if (priv == NULL) | 114 | if (priv == NULL) |
| 115 | return -ENOMEM; | 115 | return false; |
| 116 | 116 | ||
| 117 | /* For SMP, we only want to use one set of state. */ | 117 | /* For SMP, we only want to use one set of state. */ |
| 118 | r->master = priv; | 118 | r->master = priv; |