aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
Diffstat (limited to 'include/net')
-rw-r--r--include/net/net_namespace.h28
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 {
136extern struct net init_net; 136extern struct net init_net;
137 137
138#ifdef CONFIG_NET_NS 138#ifdef CONFIG_NET_NS
139extern struct net *copy_net_ns(unsigned long flags, 139struct 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
155extern struct list_head net_namespace_list; 155extern struct list_head net_namespace_list;
156 156
157extern struct net *get_net_ns_by_pid(pid_t pid); 157struct net *get_net_ns_by_pid(pid_t pid);
158extern struct net *get_net_ns_by_fd(int pid); 158struct net *get_net_ns_by_fd(int pid);
159 159
160#ifdef CONFIG_NET_NS 160#ifdef CONFIG_NET_NS
161extern void __put_net(struct net *net); 161void __put_net(struct net *net);
162 162
163static inline struct net *get_net(struct net *net) 163static 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
193extern void net_drop_ns(void *); 193void 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 */
310extern int register_pernet_subsys(struct pernet_operations *); 310int register_pernet_subsys(struct pernet_operations *);
311extern void unregister_pernet_subsys(struct pernet_operations *); 311void unregister_pernet_subsys(struct pernet_operations *);
312extern int register_pernet_device(struct pernet_operations *); 312int register_pernet_device(struct pernet_operations *);
313extern void unregister_pernet_device(struct pernet_operations *); 313void unregister_pernet_device(struct pernet_operations *);
314 314
315struct ctl_table; 315struct ctl_table;
316struct ctl_table_header; 316struct ctl_table_header;
317 317
318#ifdef CONFIG_SYSCTL 318#ifdef CONFIG_SYSCTL
319extern int net_sysctl_init(void); 319int net_sysctl_init(void);
320extern struct ctl_table_header *register_net_sysctl(struct net *net, 320struct 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);
322extern void unregister_net_sysctl_table(struct ctl_table_header *header); 322void unregister_net_sysctl_table(struct ctl_table_header *header);
323#else 323#else
324static inline int net_sysctl_init(void) { return 0; } 324static inline int net_sysctl_init(void) { return 0; }
325static inline struct ctl_table_header *register_net_sysctl(struct net *net, 325static inline struct ctl_table_header *register_net_sysctl(struct net *net,