diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-04-19 09:46:06 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-20 21:22:30 -0400 |
commit | 5f568e5afe35721f2f692bccab243ba87cd8f87a (patch) | |
tree | cf768cf2fc95974f9228848722aa1afb8fd02a33 | |
parent | a5347fe36b313c07d59b065d00a8fa56362c5f97 (diff) |
net: Remove register_net_sysctl_table
All of the users have been converted to use registera_net_sysctl so we
no longer need register_net_sysctl.
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>
-rw-r--r-- | include/net/net_namespace.h | 3 | ||||
-rw-r--r-- | net/sysctl_net.c | 7 |
2 files changed, 0 insertions, 10 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 6413fcb53cd1..3ee4a3da7168 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h | |||
@@ -279,7 +279,6 @@ extern void unregister_pernet_subsys(struct pernet_operations *); | |||
279 | extern int register_pernet_device(struct pernet_operations *); | 279 | extern int register_pernet_device(struct pernet_operations *); |
280 | extern void unregister_pernet_device(struct pernet_operations *); | 280 | extern void unregister_pernet_device(struct pernet_operations *); |
281 | 281 | ||
282 | struct ctl_path; | ||
283 | struct ctl_table; | 282 | struct ctl_table; |
284 | struct ctl_table_header; | 283 | struct ctl_table_header; |
285 | 284 | ||
@@ -288,8 +287,6 @@ extern int net_sysctl_init(void); | |||
288 | #else | 287 | #else |
289 | static inline int net_sysctl_init(void) { return 0; } | 288 | static inline int net_sysctl_init(void) { return 0; } |
290 | #endif | 289 | #endif |
291 | extern struct ctl_table_header *register_net_sysctl_table(struct net *net, | ||
292 | const struct ctl_path *path, struct ctl_table *table); | ||
293 | extern struct ctl_table_header *register_net_sysctl(struct net *net, | 290 | extern struct ctl_table_header *register_net_sysctl(struct net *net, |
294 | const char *path, struct ctl_table *table); | 291 | const char *path, struct ctl_table *table); |
295 | extern void unregister_net_sysctl_table(struct ctl_table_header *header); | 292 | extern void unregister_net_sysctl_table(struct ctl_table_header *header); |
diff --git a/net/sysctl_net.c b/net/sysctl_net.c index 2b8d1d950987..f3e813a8d107 100644 --- a/net/sysctl_net.c +++ b/net/sysctl_net.c | |||
@@ -95,13 +95,6 @@ out: | |||
95 | return ret; | 95 | return ret; |
96 | } | 96 | } |
97 | 97 | ||
98 | struct ctl_table_header *register_net_sysctl_table(struct net *net, | ||
99 | const struct ctl_path *path, struct ctl_table *table) | ||
100 | { | ||
101 | return __register_sysctl_paths(&net->sysctls, path, table); | ||
102 | } | ||
103 | EXPORT_SYMBOL_GPL(register_net_sysctl_table); | ||
104 | |||
105 | struct ctl_table_header *register_net_sysctl(struct net *net, | 98 | struct ctl_table_header *register_net_sysctl(struct net *net, |
106 | const char *path, struct ctl_table *table) | 99 | const char *path, struct ctl_table *table) |
107 | { | 100 | { |