aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/unix/sysctl_net_unix.c24
1 files changed, 5 insertions, 19 deletions
diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
index c46cec04d23f..43dd356730fd 100644
--- a/net/unix/sysctl_net_unix.c
+++ b/net/unix/sysctl_net_unix.c
@@ -26,31 +26,17 @@ static ctl_table unix_table[] = {
26 { .ctl_name = 0 } 26 { .ctl_name = 0 }
27}; 27};
28 28
29static ctl_table unix_net_table[] = { 29static struct ctl_path unix_path[] = {
30 { 30 { .procname = "net", .ctl_name = CTL_NET, },
31 .ctl_name = NET_UNIX, 31 { .procname = "unix", .ctl_name = NET_UNIX, },
32 .procname = "unix", 32 { },
33 .mode = 0555,
34 .child = unix_table
35 },
36 { .ctl_name = 0 }
37};
38
39static ctl_table unix_root_table[] = {
40 {
41 .ctl_name = CTL_NET,
42 .procname = "net",
43 .mode = 0555,
44 .child = unix_net_table
45 },
46 { .ctl_name = 0 }
47}; 33};
48 34
49static struct ctl_table_header * unix_sysctl_header; 35static struct ctl_table_header * unix_sysctl_header;
50 36
51int unix_sysctl_register(struct net *net) 37int unix_sysctl_register(struct net *net)
52{ 38{
53 unix_sysctl_header = register_sysctl_table(unix_root_table); 39 unix_sysctl_header = register_sysctl_paths(unix_path, unix_table);
54 return unix_sysctl_header == NULL ? -ENOMEM : 0; 40 return unix_sysctl_header == NULL ? -ENOMEM : 0;
55} 41}
56 42