diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-13 00:26:33 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-13 00:26:33 -0400 |
| commit | bed04a4413376265746053be2a9cfbfc80c98ec9 (patch) | |
| tree | 8f582294a655f70496cd08aedeb86de31dbad140 /net/ipv6/sysctl_net_ipv6.c | |
| parent | e37c772e36a7943b2e0bd8f48312e78474c0df15 (diff) | |
| parent | c463be3520065ef8c05e3cbdf946c69604e91ceb (diff) | |
Merge branch '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; |