netfilter 04/09: x_tables: fix match/target revision lookup

[safe/jmp/linux-2.6] / net / ipx / sysctl_net_ipx.c

diff --git a/net/ipx/sysctl_net_ipx.c b/net/ipx/sysctl_net_ipx.c
index 510eda9..633fcab 100644 (file)
--- a/net/ipx/sysctl_net_ipx.c
+++ b/net/ipx/sysctl_net_ipx.c
@@ -6,7 +6,6 @@
  * Added /proc/sys/net/ipx/ipx_pprop_broadcasting - acme March 4, 2001
  */
 
-#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/sysctl.h>
 
@@ -24,36 +23,22 @@ static struct ctl_table ipx_table[] = {
                .data           = &sysctl_ipx_pprop_broadcasting,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dointvec,
+               .proc_handler   = proc_dointvec,
        },
        { 0 },
 };
 
-static struct ctl_table ipx_dir_table[] = {
-       {
-               .ctl_name       = NET_IPX,
-               .procname       = "ipx",
-               .mode           = 0555,
-               .child          = ipx_table,
-               },
-       { 0 },
-};
-
-static struct ctl_table ipx_root_table[] = {
-       {
-               .ctl_name       = CTL_NET,
-               .procname       = "net",
-               .mode           = 0555,
-               .child          = ipx_dir_table,
-       },
-       { 0 },
+static struct ctl_path ipx_path[] = {
+       { .procname = "net", .ctl_name = CTL_NET, },
+       { .procname = "ipx", .ctl_name = NET_IPX, },
+       { }
 };
 
 static struct ctl_table_header *ipx_table_header;
 
 void ipx_register_sysctl(void)
 {
-       ipx_table_header = register_sysctl_table(ipx_root_table, 1);
+       ipx_table_header = register_sysctl_paths(ipx_path, ipx_table);
 }
 
 void ipx_unregister_sysctl(void)