Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25: (1470 commits)
  [IPV6] ADDRLABEL: Fix double free on label deletion.
  [PPP]: Sparse warning fixes.
  [IPV4] fib_trie: remove unneeded NULL check
  [IPV4] fib_trie: More whitespace cleanup.
  [NET_SCHED]: Use nla_policy for attribute validation in ematches
  [NET_SCHED]: Use nla_policy for attribute validation in actions
  [NET_SCHED]: Use nla_policy for attribute validation in classifiers
  [NET_SCHED]: Use nla_policy for attribute validation in packet schedulers
  [NET_SCHED]: sch_api: introduce constant for rate table size
  [NET_SCHED]: Use typeful attribute parsing helpers
  [NET_SCHED]: Use typeful attribute construction helpers
  [NET_SCHED]: Use NLA_PUT_STRING for string dumping
  [NET_SCHED]: Use nla_nest_start/nla_nest_end
  [NET_SCHED]: Propagate nla_parse return value
  [NET_SCHED]: act_api: use PTR_ERR in tcf_action_init/tcf_action_get
  [NET_SCHED]: act_api: use nlmsg_parse
  [NET_SCHED]: act_api: fix netlink API conversion bug
  [NET_SCHED]: sch_netem: use nla_parse_nested_compat
  [NET_SCHED]: sch_atm: fix format string warning
  [NETNS]: Add namespace for ICMP replying code.
  ...

1 files changed, 7 insertions, 29 deletions

diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c
index c62c05039f69..21295993fdb8 100644
--- a/net/dccp/sysctl.c
+++ b/net/dccp/sysctl.c
@@ -100,41 +100,19 @@ static struct ctl_table dccp_default_table[] = {
         { .ctl_name = 0, }
 };
 
-static struct ctl_table dccp_table[] = {
-        {
-                .ctl_name       = NET_DCCP_DEFAULT,
-                .procname       = "default",
-                .mode           = 0555,
-                .child          = dccp_default_table,
-        },
-        { .ctl_name = 0, },
-};
-
-static struct ctl_table dccp_dir_table[] = {
-        {
-                .ctl_name       = NET_DCCP,
-                .procname       = "dccp",
-                .mode           = 0555,
-                .child          = dccp_table,
-        },
-        { .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;
 }