Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / net / dccp / sysctl.c

diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c
index 1260aab..2129599 100644 (file)
--- a/net/dccp/sysctl.c
+++ b/net/dccp/sysctl.c
@@ -89,45 +89,30 @@ static struct ctl_table dccp_default_table[] = {
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
        },
-
-       { .ctl_name = 0, }
-};
-
-static struct ctl_table dccp_table[] = {
        {
-               .ctl_name       = NET_DCCP_DEFAULT,
-               .procname       = "default",
-               .mode           = 0555,
-               .child          = dccp_default_table,
+               .procname       = "sync_ratelimit",
+               .data           = &sysctl_dccp_sync_ratelimit,
+               .maxlen         = sizeof(sysctl_dccp_sync_ratelimit),
+               .mode           = 0644,
+               .proc_handler   = proc_dointvec_ms_jiffies,
        },
-       { .ctl_name = 0, },
-};
 
-static struct ctl_table dccp_dir_table[] = {
-       {
-               .ctl_name       = NET_DCCP,
-               .procname       = "dccp",
-               .mode           = 0555,
-               .child          = dccp_table,
-       },
-       { .ctl_name = 0, },
+       { .ctl_name = 0, }
 };
 
-static struct ctl_table dccp_root_table[] = {
-       {
-               .ctl_name       = CTL_NET,
-               .procname       = "net",
-               .mode           = 0555,
-               .child          = dccp_dir_table,
-       },
-       { .ctl_name = 0, },
+static struct ctl_path dccp_path[] = {
+       { .procname = "net", .ctl_name = CTL_NET, },
+       { .procname = "dccp", .ctl_name = NET_DCCP, },
+       { .procname = "default", .ctl_name = NET_DCCP_DEFAULT, },
+       { }
 };
 
 static struct ctl_table_header *dccp_table_header;
 
 int __init dccp_sysctl_init(void)
 {
-       dccp_table_header = register_sysctl_table(dccp_root_table);
+       dccp_table_header = register_sysctl_paths(dccp_path,
+                       dccp_default_table);
 
        return dccp_table_header != NULL ? 0 : -ENOMEM;
 }