[NETFILTER]: nf_conntrack_sctp: remove timeout indirection

[mv-sheeva.git] / net / netfilter / nf_sysctl.c

diff --git a/net/netfilter/nf_sysctl.c b/net/netfilter/nf_sysctl.c
index ee34589e48a4407918b06a3f2452611d38366399..d9fcc893301df8248a9eb33e24ea7674a8a19182 100644 (file)
--- a/net/netfilter/nf_sysctl.c
+++ b/net/netfilter/nf_sysctl.c
@@ -7,128 +7,19 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 
-static void
-path_free(struct ctl_table *path, struct ctl_table *table)
-{
-       struct ctl_table *t, *next;
-
-       for (t = path; t != NULL && t != table; t = next) {
-               next = t->child;
-               kfree(t);
-       }
-}
-
-static struct ctl_table *
-path_dup(struct ctl_table *path, struct ctl_table *table)
-{
-       struct ctl_table *t, *last = NULL, *tmp;
-
-       for (t = path; t != NULL; t = t->child) {
-               /* twice the size since path elements are terminated by an
-                * empty element */
-               tmp = kmemdup(t, 2 * sizeof(*t), GFP_KERNEL);
-               if (tmp == NULL) {
-                       if (last != NULL)
-                               path_free(path, table);
-                       return NULL;
-               }
-
-               if (last != NULL)
-                       last->child = tmp;
-               else
-                       path = tmp;
-               last = tmp;
-       }
-
-       if (last != NULL)
-               last->child = table;
-       else
-               path = table;
-
-       return path;
-}
-
-struct ctl_table_header *
-nf_register_sysctl_table(struct ctl_table *path, struct ctl_table *table)
-{
-       struct ctl_table_header *header;
-
-       path = path_dup(path, table);
-       if (path == NULL)
-               return NULL;
-       header = register_sysctl_table(path);
-       if (header == NULL)
-               path_free(path, table);
-       return header;
-}
-EXPORT_SYMBOL_GPL(nf_register_sysctl_table);
-
-void
-nf_unregister_sysctl_table(struct ctl_table_header *header,
-                          struct ctl_table *table)
-{
-       struct ctl_table *path = header->ctl_table;
-
-       unregister_sysctl_table(header);
-       path_free(path, table);
-}
-EXPORT_SYMBOL_GPL(nf_unregister_sysctl_table);
-
 /* net/netfilter */
-static struct ctl_table nf_net_netfilter_table[] = {
-       {
-               .ctl_name       = NET_NETFILTER,
-               .procname       = "netfilter",
-               .mode           = 0555,
-       },
-       {
-               .ctl_name       = 0
-       }
-};
-struct ctl_table nf_net_netfilter_sysctl_path[] = {
-       {
-               .ctl_name       = CTL_NET,
-               .procname       = "net",
-               .mode           = 0555,
-               .child          = nf_net_netfilter_table,
-       },
-       {
-               .ctl_name       = 0
-       }
+struct ctl_path nf_net_netfilter_sysctl_path[] = {
+       { .procname = "net", .ctl_name = CTL_NET, },
+       { .procname = "netfilter", .ctl_name = NET_NETFILTER, },
+       { }
 };
 EXPORT_SYMBOL_GPL(nf_net_netfilter_sysctl_path);
 
 /* net/ipv4/netfilter */
-static struct ctl_table nf_net_ipv4_netfilter_table[] = {
-       {
-               .ctl_name       = NET_IPV4_NETFILTER,
-               .procname       = "netfilter",
-               .mode           = 0555,
-       },
-       {
-               .ctl_name       = 0
-       }
-};
-static struct ctl_table nf_net_ipv4_table[] = {
-       {
-               .ctl_name       = NET_IPV4,
-               .procname       = "ipv4",
-               .mode           = 0555,
-               .child          = nf_net_ipv4_netfilter_table,
-       },
-       {
-               .ctl_name       = 0
-       }
-};
-struct ctl_table nf_net_ipv4_netfilter_sysctl_path[] = {
-       {
-               .ctl_name       = CTL_NET,
-               .procname       = "net",
-               .mode           = 0555,
-               .child          = nf_net_ipv4_table,
-       },
-       {
-               .ctl_name       = 0
-       }
+struct ctl_path nf_net_ipv4_netfilter_sysctl_path[] = {
+       { .procname = "net", .ctl_name = CTL_NET, },
+       { .procname = "ipv4", .ctl_name = NET_IPV4, },
+       { .procname = "netfilter", .ctl_name = NET_IPV4_NETFILTER, },
+       { }
 };
 EXPORT_SYMBOL_GPL(nf_net_ipv4_netfilter_sysctl_path);