aboutsummaryrefslogtreecommitdiffstats
path: root/net/phonet/sysctl.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-04-19 09:24:33 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-20 21:21:17 -0400
commit5dd3df105b9f6cb7dd2472b59e028d0d1c878ecb (patch)
treeb12606e6e74ee6d07823eb268e09d899946279fd /net/phonet/sysctl.c
parent4344475797a16ef948385780943f7a5cf09f0675 (diff)
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/phonet/sysctl.c')
-rw-r--r--net/phonet/sysctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/phonet/sysctl.c b/net/phonet/sysctl.c
index 8bed7675b3f4..aa55db5f383b 100644
--- a/net/phonet/sysctl.c
+++ b/net/phonet/sysctl.c
@@ -106,11 +106,11 @@ static struct ctl_path phonet_ctl_path[] = {
106 106
107int __init phonet_sysctl_init(void) 107int __init phonet_sysctl_init(void)
108{ 108{
109 phonet_table_hrd = register_sysctl_paths(phonet_ctl_path, phonet_table); 109 phonet_table_hrd = register_net_sysctl_table(&init_net, phonet_ctl_path, phonet_table);
110 return phonet_table_hrd == NULL ? -ENOMEM : 0; 110 return phonet_table_hrd == NULL ? -ENOMEM : 0;
111} 111}
112 112
113void phonet_sysctl_exit(void) 113void phonet_sysctl_exit(void)
114{ 114{
115 unregister_sysctl_table(phonet_table_hrd); 115 unregister_net_sysctl_table(phonet_table_hrd);
116} 116}