| commit | 73570314e4fa1605189a32c493fd15eebdc44863 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Nov 23 09:52:51 2009 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Mon Nov 23 09:52:51 2009 -0800 |
| tree | 7d36ef1cee1177593b1a45b7619170b5bfa51298 | |
| parent | 63edaf647607795a065e6956a79c47f500dc8447 [diff] | |
| parent | 8fa539bd911e8a7faa7cd77b5192229c9666d9b8 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
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 @@ 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;