Commit 33eb9cfc authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller

[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: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7e2e109c
...@@ -1325,10 +1325,6 @@ extern __u32 sysctl_rmem_max; ...@@ -1325,10 +1325,6 @@ extern __u32 sysctl_rmem_max;
extern void sk_init(void); extern void sk_init(void);
#ifdef CONFIG_SYSCTL
extern struct ctl_table core_table[];
#endif
extern int sysctl_optmem_max; extern int sysctl_optmem_max;
extern __u32 sysctl_wmem_default; extern __u32 sysctl_wmem_default;
......
...@@ -10,10 +10,11 @@ ...@@ -10,10 +10,11 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/socket.h> #include <linux/socket.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/init.h>
#include <net/sock.h> #include <net/sock.h>
#include <net/xfrm.h> #include <net/xfrm.h>
ctl_table core_table[] = { static struct ctl_table net_core_table[] = {
#ifdef CONFIG_NET #ifdef CONFIG_NET
{ {
.ctl_name = NET_CORE_WMEM_MAX, .ctl_name = NET_CORE_WMEM_MAX,
...@@ -149,3 +150,19 @@ ctl_table core_table[] = { ...@@ -149,3 +150,19 @@ ctl_table core_table[] = {
}, },
{ .ctl_name = 0 } { .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);
...@@ -31,12 +31,6 @@ ...@@ -31,12 +31,6 @@
#endif #endif
struct ctl_table net_table[] = { struct ctl_table net_table[] = {
{
.ctl_name = NET_CORE,
.procname = "core",
.mode = 0555,
.child = core_table,
},
#ifdef CONFIG_INET #ifdef CONFIG_INET
{ {
.ctl_name = NET_IPV4, .ctl_name = NET_IPV4,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment