Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=33eb9cfc700ae9ce621d47d6ca6d6b4ad7cd97f3
Commit:     33eb9cfc700ae9ce621d47d6ca6d6b4ad7cd97f3
Parent:     7e2e109cef0d59abcb9aca8b82993e304ed8970c
Author:     Pavel Emelyanov <[EMAIL PROTECTED]>
AuthorDate: Wed Dec 5 01:37:34 2007 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 14:56:26 2008 -0800

    [NET]: Isolate the net/core/ sysctl table
    
    Using ctl paths we can put all the stuff, related to net/core/
    sysctl table, into one file and remove all the references on it.
    
    As a good side effect this hides the "core_table" name from
    the global scope :)
    
    Signed-off-by: Pavel Emelyanov <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 include/net/sock.h         |    4 ----
 net/core/sysctl_net_core.c |   19 ++++++++++++++++++-
 net/sysctl_net.c           |    6 ------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/include/net/sock.h b/include/net/sock.h
index 800e73a..4ce37ce 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1325,10 +1325,6 @@ extern __u32 sysctl_rmem_max;
 
 extern void sk_init(void);
 
-#ifdef CONFIG_SYSCTL
-extern struct ctl_table core_table[];
-#endif
-
 extern int sysctl_optmem_max;
 
 extern __u32 sysctl_wmem_default;
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index 277c8fa..e322713 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -10,10 +10,11 @@
 #include <linux/module.h>
 #include <linux/socket.h>
 #include <linux/netdevice.h>
+#include <linux/init.h>
 #include <net/sock.h>
 #include <net/xfrm.h>
 
-ctl_table core_table[] = {
+static struct ctl_table net_core_table[] = {
 #ifdef CONFIG_NET
        {
                .ctl_name       = NET_CORE_WMEM_MAX,
@@ -149,3 +150,19 @@ ctl_table core_table[] = {
        },
        { .ctl_name = 0 }
 };
+
+static __initdata struct ctl_path net_core_path[] = {
+       { .procname = "net", .ctl_name = CTL_NET, },
+       { .procname = "core", .ctl_name = NET_CORE, },
+       { },
+};
+
+static __init int sysctl_core_init(void)
+{
+       struct ctl_table_header *hdr;
+
+       hdr = register_sysctl_paths(net_core_path, net_core_table);
+       return hdr == NULL ? -ENOMEM : 0;
+}
+
+__initcall(sysctl_core_init);
diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index c50c793..747fc55 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -31,12 +31,6 @@
 #endif
 
 struct ctl_table net_table[] = {
-       {
-               .ctl_name       = NET_CORE,
-               .procname       = "core",
-               .mode           = 0555,
-               .child          = core_table,
-       },
 #ifdef CONFIG_INET
        {
                .ctl_name       = NET_IPV4,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to