5 files changed, 7 insertions, 16 deletions

diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 6a2f85cd440e..71e5c328176c 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -782,7 +782,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
                 table[2].data = &net->ipv4.frags.timeout;
         }
 
-        hdr = register_net_sysctl_table(net, net_ipv4_ctl_path, table);
+        hdr = register_net_sysctl(net, "net/ipv4", table);
         if (hdr == NULL)
                 goto err_reg;
 
diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
index 766485d7d099..09775a1e1348 100644
--- a/net/ipv4/netfilter/ip_queue.c
+++ b/net/ipv4/netfilter/ip_queue.c
@@ -586,7 +586,7 @@ static int __init ip_queue_init(void)
 #endif
         register_netdevice_notifier(&ipq_dev_notifier);
 #ifdef CONFIG_SYSCTL
-        ipq_sysctl_header = register_net_sysctl_table(&init_net, net_ipv4_ctl_path, ipq_table);
+        ipq_sysctl_header = register_net_sysctl(&init_net, "net/ipv4", ipq_table);
 #endif
         status = nf_register_queue_handler(NFPROTO_IPV4, &nfqh);
         if (status < 0) {
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index adf2105a6e85..5773f5d9e213 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -3354,13 +3354,6 @@ static struct ctl_table ipv4_route_flush_table[] = {
         { },
 };
 
-static __net_initdata struct ctl_path ipv4_route_path[] = {
-        { .procname = "net", },
-        { .procname = "ipv4", },
-        { .procname = "route", },
-        { },
-};
-
 static __net_init int sysctl_route_net_init(struct net *net)
 {
         struct ctl_table *tbl;
@@ -3373,8 +3366,7 @@ static __net_init int sysctl_route_net_init(struct net *net)
         }
         tbl[0].extra1 = net;
 
-        net->ipv4.route_hdr =
-                register_net_sysctl_table(net, ipv4_route_path, tbl);
+        net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
         if (net->ipv4.route_hdr == NULL)
                 goto err_reg;
         return 0;
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index e7a6fa3d70bb..56e64f7b75d0 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -815,8 +815,7 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
 
         tcp_init_mem(net);
 
-        net->ipv4.ipv4_hdr = register_net_sysctl_table(net,
-                        net_ipv4_ctl_path, table);
+        net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
         if (net->ipv4.ipv4_hdr == NULL)
                 goto err_reg;
 
@@ -857,7 +856,7 @@ static __init int sysctl_ipv4_init(void)
         if (!i->procname)
                 return -EINVAL;
 
-        hdr = register_net_sysctl_table(&init_net, net_ipv4_ctl_path, ipv4_table);
+        hdr = register_net_sysctl(&init_net, "net/ipv4", ipv4_table);
         if (hdr == NULL)
                 return -ENOMEM;
 
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index 8ef24e16afce..0d3426cb5c4f 100644
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -298,8 +298,8 @@ void __init xfrm4_init(int rt_max_size)
         xfrm4_state_init();
         xfrm4_policy_init();
 #ifdef CONFIG_SYSCTL
-        sysctl_hdr = register_net_sysctl_table(&init_net, net_ipv4_ctl_path,
-                                                xfrm4_policy_table);
+        sysctl_hdr = register_net_sysctl(&init_net, "net/ipv4",
+                                         xfrm4_policy_table);
 #endif
 }