summaryrefslogtreecommitdiffstats
path: root/net/llc/sysctl_net_llc.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-04-19 15:24:33 +0200
committerDavid S. Miller <davem@davemloft.net>2012-04-21 03:21:17 +0200
commit5dd3df105b9f6cb7dd2472b59e028d0d1c878ecb (patch)
treeb12606e6e74ee6d07823eb268e09d899946279fd /net/llc/sysctl_net_llc.c
parentnet: Kill register_sysctl_rotable (diff)
downloadlinux-5dd3df105b9f6cb7dd2472b59e028d0d1c878ecb.tar.xz
linux-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/sysctl_net_llc.c')
-rw-r--r--net/llc/sysctl_net_llc.c5
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;
}
}