From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 25 Aug 2008 22:18:15 +0000 (-0700)
Subject: ipv6: sysctl fixes
X-Git-Tag: v2.6.27-rc5~30^2~9
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ce3113ec57abcd41cc5a2fed02474aee3f63d12c;p=linux-2.6-omap-h63xx.git

ipv6: sysctl fixes

Braino: net.ipv6 in ipv6 skeleton has no business in rotable
class

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
index e6dfaeac6be..587f8f60c48 100644
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@ -156,7 +156,7 @@ static struct ctl_table_header *ip6_base;
 int ipv6_static_sysctl_register(void)
 {
 	static struct ctl_table empty[1];
-	ip6_base = register_net_sysctl_rotable(net_ipv6_ctl_path, empty);
+	ip6_base = register_sysctl_paths(net_ipv6_ctl_path, empty);
 	if (ip6_base == NULL)
 		return -ENOMEM;
 	return 0;