diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-15 06:13:28 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-15 06:13:28 +0400 |
| commit | 11b397e6eb12191300ca19290f29f51f61118953 (patch) | |
| tree | 6e0f8cb52cbcdb02108755f3d643a025a943bd79 /net/netfilter/nf_conntrack_standalone.c | |
| parent | e1c969f7814dcd23bbfe8d777544321a492b6fee (diff) | |
| parent | 41ef2d5678d83af030125550329b6ae8b74618fa (diff) | |
| download | linux-11b397e6eb12191300ca19290f29f51f61118953.tar.xz | |
Merge 3.9-rc7 intp tty-next
We want the fixes here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_standalone.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_standalone.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c index 6bcce401fd1c..fedee3943661 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c @@ -568,6 +568,7 @@ static int __init nf_conntrack_standalone_init(void) register_net_sysctl(&init_net, "net", nf_ct_netfilter_table); if (!nf_ct_netfilter_header) { pr_err("nf_conntrack: can't register to sysctl.\n"); + ret = -ENOMEM; goto out_sysctl; } #endif |