diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-04-19 13:24:33 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-20 21:21:17 -0400 |
| commit | 5dd3df105b9f6cb7dd2472b59e028d0d1c878ecb (patch) | |
| tree | b12606e6e74ee6d07823eb268e09d899946279fd /net/llc | |
| parent | 4344475797a16ef948385780943f7a5cf09f0675 (diff) | |
| download | linux-stable-5dd3df105b9f6cb7dd2472b59e028d0d1c878ecb.tar.gz linux-stable-5dd3df105b9f6cb7dd2472b59e028d0d1c878ecb.tar.bz2 linux-stable-5dd3df105b9f6cb7dd2472b59e028d0d1c878ecb.zip | |
net: Move all of the network sysctls without a namespace into init_net.
This makes it clearer which sysctls are relative to your current network
namespace.
This makes it a little less error prone by not exposing sysctls for the
initial network namespace in other namespaces.
This is the same way we handle all of our other network interfaces to
userspace and I can't honestly remember why we didn't do this for
sysctls right from the start.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/llc')
| -rw-r--r-- | net/llc/sysctl_net_llc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/llc/sysctl_net_llc.c b/net/llc/sysctl_net_llc.c index e2ebe3586263..9a6a65f2104b 100644 --- a/net/llc/sysctl_net_llc.c +++ b/net/llc/sysctl_net_llc.c @@ -7,6 +7,7 @@ #include <linux/mm.h> #include <linux/init.h> #include <linux/sysctl.h> +#include <net/net_namespace.h> #include <net/llc.h> #ifndef CONFIG_SYSCTL @@ -89,7 +90,7 @@ static struct ctl_table_header *llc_table_header; int __init llc_sysctl_init(void) { - llc_table_header = register_sysctl_paths(llc_path, llc_table); + llc_table_header = register_net_sysctl_table(&init_net, llc_path, llc_table); return llc_table_header ? 0 : -ENOMEM; } @@ -97,7 +98,7 @@ int __init llc_sysctl_init(void) void llc_sysctl_exit(void) { if (llc_table_header) { - unregister_sysctl_table(llc_table_header); + unregister_net_sysctl_table(llc_table_header); llc_table_header = NULL; } } |