diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-03-03 14:18:08 -0500 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-03-03 14:18:08 -0500 |
| commit | 27710bf6febe8323f78bceca002ca7d71e5012a7 (patch) | |
| tree | 80a72f385ea28f9f7649363fe5147b3da37f9950 /net/ipv6/sysctl_net_ipv6.c | |
| parent | 9ef64cb4320df821638b508f79aa8b858cca99f0 (diff) | |
| parent | cad226b8a71f969ad05137e43b48c9e6059a0b9f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/ipv6/sysctl_net_ipv6.c')
| -rw-r--r-- | net/ipv6/sysctl_net_ipv6.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c index 408691b777c2..d6d3e68086f8 100644 --- a/net/ipv6/sysctl_net_ipv6.c +++ b/net/ipv6/sysctl_net_ipv6.c | |||
| @@ -102,9 +102,6 @@ static int ipv6_sysctl_net_init(struct net *net) | |||
| 102 | net->ipv6.sysctl.table = register_net_sysctl_table(net, net_ipv6_ctl_path, | 102 | net->ipv6.sysctl.table = register_net_sysctl_table(net, net_ipv6_ctl_path, |
| 103 | ipv6_table); | 103 | ipv6_table); |
| 104 | if (!net->ipv6.sysctl.table) | 104 | if (!net->ipv6.sysctl.table) |
| 105 | return -ENOMEM; | ||
| 106 | |||
| 107 | if (!net->ipv6.sysctl.table) | ||
| 108 | goto out_ipv6_icmp_table; | 105 | goto out_ipv6_icmp_table; |
| 109 | 106 | ||
| 110 | err = 0; | 107 | err = 0; |