diff options
| author | Denis V. Lunev <den@openvz.org> | 2008-04-02 00:09:29 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-02 00:09:29 -0700 |
| commit | 225c0a0107735597100dc4133cd88c5ed10d9e63 (patch) | |
| tree | c82526bf42ccc2e29761cce80f3f60a1ce491855 /include/net | |
| parent | f0bdb7ba5af5a7028479e9067ee74e9d66eea6df (diff) | |
| download | blackbird-obmc-linux-225c0a0107735597100dc4133cd88c5ed10d9e63.tar.gz blackbird-obmc-linux-225c0a0107735597100dc4133cd88c5ed10d9e63.zip | |
[NETNS]: Merge ifdef CONFIG_NET in include/net/net_namespace.h.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/net_namespace.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index c01d45fe08c3..4a37037b1d17 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -59,25 +59,27 @@ struct net { #endif }; + #ifdef CONFIG_NET /* Init's network namespace */ extern struct net init_net; #define INIT_NET_NS(net_ns) .net_ns = &init_net, -#else -#define INIT_NET_NS(net_ns) -#endif -extern struct list_head net_namespace_list; - -#ifdef CONFIG_NET extern struct net *copy_net_ns(unsigned long flags, struct net *net_ns); -#else + +#else /* CONFIG_NET */ + +#define INIT_NET_NS(net_ns) + static inline struct net *copy_net_ns(unsigned long flags, struct net *net_ns) { /* There is nothing to copy so this is a noop */ return net_ns; } -#endif +#endif /* CONFIG_NET */ + + +extern struct list_head net_namespace_list; #ifdef CONFIG_NET_NS extern void __put_net(struct net *net); |
