diff options
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/net_namespace.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 1313456a0994..38c2afb585de 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h | |||
@@ -136,8 +136,8 @@ struct net { | |||
136 | extern struct net init_net; | 136 | extern struct net init_net; |
137 | 137 | ||
138 | #ifdef CONFIG_NET_NS | 138 | #ifdef CONFIG_NET_NS |
139 | extern struct net *copy_net_ns(unsigned long flags, | 139 | struct net *copy_net_ns(unsigned long flags, struct user_namespace *user_ns, |
140 | struct user_namespace *user_ns, struct net *old_net); | 140 | struct net *old_net); |
141 | 141 | ||
142 | #else /* CONFIG_NET_NS */ | 142 | #else /* CONFIG_NET_NS */ |
143 | #include <linux/sched.h> | 143 | #include <linux/sched.h> |
@@ -154,11 +154,11 @@ static inline struct net *copy_net_ns(unsigned long flags, | |||
154 | 154 | ||
155 | extern struct list_head net_namespace_list; | 155 | extern struct list_head net_namespace_list; |
156 | 156 | ||
157 | extern struct net *get_net_ns_by_pid(pid_t pid); | 157 | struct net *get_net_ns_by_pid(pid_t pid); |
158 | extern struct net *get_net_ns_by_fd(int pid); | 158 | struct net *get_net_ns_by_fd(int pid); |
159 | 159 | ||
160 | #ifdef CONFIG_NET_NS | 160 | #ifdef CONFIG_NET_NS |
161 | extern void __put_net(struct net *net); | 161 | void __put_net(struct net *net); |
162 | 162 | ||
163 | static inline struct net *get_net(struct net *net) | 163 | static inline struct net *get_net(struct net *net) |
164 | { | 164 | { |
@@ -190,7 +190,7 @@ int net_eq(const struct net *net1, const struct net *net2) | |||
190 | return net1 == net2; | 190 | return net1 == net2; |
191 | } | 191 | } |
192 | 192 | ||
193 | extern void net_drop_ns(void *); | 193 | void net_drop_ns(void *); |
194 | 194 | ||
195 | #else | 195 | #else |
196 | 196 | ||
@@ -307,19 +307,19 @@ struct pernet_operations { | |||
307 | * device which caused kernel oops, and panics during network | 307 | * device which caused kernel oops, and panics during network |
308 | * namespace cleanup. So please don't get this wrong. | 308 | * namespace cleanup. So please don't get this wrong. |
309 | */ | 309 | */ |
310 | extern int register_pernet_subsys(struct pernet_operations *); | 310 | int register_pernet_subsys(struct pernet_operations *); |
311 | extern void unregister_pernet_subsys(struct pernet_operations *); | 311 | void unregister_pernet_subsys(struct pernet_operations *); |
312 | extern int register_pernet_device(struct pernet_operations *); | 312 | int register_pernet_device(struct pernet_operations *); |
313 | extern void unregister_pernet_device(struct pernet_operations *); | 313 | void unregister_pernet_device(struct pernet_operations *); |
314 | 314 | ||
315 | struct ctl_table; | 315 | struct ctl_table; |
316 | struct ctl_table_header; | 316 | struct ctl_table_header; |
317 | 317 | ||
318 | #ifdef CONFIG_SYSCTL | 318 | #ifdef CONFIG_SYSCTL |
319 | extern int net_sysctl_init(void); | 319 | int net_sysctl_init(void); |
320 | extern struct ctl_table_header *register_net_sysctl(struct net *net, | 320 | struct ctl_table_header *register_net_sysctl(struct net *net, const char *path, |
321 | const char *path, struct ctl_table *table); | 321 | struct ctl_table *table); |
322 | extern void unregister_net_sysctl_table(struct ctl_table_header *header); | 322 | void unregister_net_sysctl_table(struct ctl_table_header *header); |
323 | #else | 323 | #else |
324 | static inline int net_sysctl_init(void) { return 0; } | 324 | static inline int net_sysctl_init(void) { return 0; } |
325 | static inline struct ctl_table_header *register_net_sysctl(struct net *net, | 325 | static inline struct ctl_table_header *register_net_sysctl(struct net *net, |