From f6319d295c1fdd660bf82bf3b5c48ff2145ac84d Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Wed, 5 Dec 2007 01:44:02 -0800
Subject: [PATCH] --- yaml --- r: 78335 b: refs/heads/master c:
 4d43b78ac27ca50fe42718192ac7c80474417389 h: refs/heads/master i:   78333:
 500eb0881a72234136d376d7e11fa6b3bda3d86a   78331:
 04f9698d629c05b887b584dad642f6aff3ee3e52   78327:
 cc9fa20c29936efd3c0975083fb550194dd69ac7   78319:
 ad229f77b723929f349c71fea82148a7164edce3   78303:
 2cf6fc5bb9d973469646958910db8feba0454ed8   78271:
 eed44cd4faaefe1f359eb03dda008a7e520b6a32   78207:
 794646b54e1e45b84ff04973167e78e50da4c778   78079:
 c5974ca409757d3f69e6c5b1e44339f4b93d2169   77823:
 6823498d406e27ca64bccfa471b34b2d50ea1fa5 v: v3

---
 [refs]                           |  2 +-
 trunk/net/ipv6/sysctl_net_ipv6.c | 26 ++++++--------------------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 4dd8c944f64d..cf2a61f5dbcf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a61b586cd7eaab6242eca58e8e6e3c8ebd88bd2
+refs/heads/master: 4d43b78ac27ca50fe42718192ac7c80474417389
diff --git a/trunk/net/ipv6/sysctl_net_ipv6.c b/trunk/net/ipv6/sysctl_net_ipv6.c
index 227efa726acd..0b5bec3cb797 100644
--- a/trunk/net/ipv6/sysctl_net_ipv6.c
+++ b/trunk/net/ipv6/sysctl_net_ipv6.c
@@ -82,31 +82,17 @@ static ctl_table ipv6_table[] = {
 	{ .ctl_name = 0 }
 };
 
-static struct ctl_table_header *ipv6_sysctl_header;
-
-static ctl_table ipv6_net_table[] = {
-	{
-		.ctl_name	= NET_IPV6,
-		.procname	= "ipv6",
-		.mode		= 0555,
-		.child		= ipv6_table
-	},
-	{ .ctl_name = 0 }
+static struct ctl_path ipv6_ctl_path[] = {
+	{ .procname = "net", .ctl_name = CTL_NET, },
+	{ .procname = "ipv6", .ctl_name = NET_IPV6, },
+	{ },
 };
 
-static ctl_table ipv6_root_table[] = {
-	{
-		.ctl_name	= CTL_NET,
-		.procname	= "net",
-		.mode		= 0555,
-		.child		= ipv6_net_table
-	},
-	{ .ctl_name = 0 }
-};
+static struct ctl_table_header *ipv6_sysctl_header;
 
 void ipv6_sysctl_register(void)
 {
-	ipv6_sysctl_header = register_sysctl_table(ipv6_root_table);
+	ipv6_sysctl_header = register_sysctl_paths(ipv6_ctl_path, ipv6_table);
 }
 
 void ipv6_sysctl_unregister(void)