diff options
author | Denis V. Lunev <den@openvz.org> | 2008-04-03 16:04:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-03 16:04:33 -0400 |
commit | a4aa834a9165150252c5cd953faab4de29d51b87 (patch) | |
tree | e96e20355057dfabd279b7b7c94fedeffed4e020 /include/net | |
parent | e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a (diff) |
[NETNS]: Declare init_net even without CONFIG_NET defined.
This does not look good, but there is no other choice. The compilation
without CONFIG_NET is broken and can not be fixed with ease.
After that there is no need for the following commits:
1567ca7eec7664b8be3b07755ac59dc1b1ec76cb
3edf8fa5ccf10688a9280b5cbca8ed3947c42866
2d38f9a4f8d2ebdc799f03eecf82345825495711
Revert them.
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 6c9a48a46685..0ab62ed2fdef 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h | |||
@@ -60,11 +60,12 @@ struct net { | |||
60 | }; | 60 | }; |
61 | 61 | ||
62 | 62 | ||
63 | #ifdef CONFIG_NET | ||
64 | #include <linux/seq_file_net.h> | 63 | #include <linux/seq_file_net.h> |
65 | 64 | ||
66 | /* Init's network namespace */ | 65 | /* Init's network namespace */ |
67 | extern struct net init_net; | 66 | extern struct net init_net; |
67 | |||
68 | #ifdef CONFIG_NET | ||
68 | #define INIT_NET_NS(net_ns) .net_ns = &init_net, | 69 | #define INIT_NET_NS(net_ns) .net_ns = &init_net, |
69 | 70 | ||
70 | extern struct net *copy_net_ns(unsigned long flags, struct net *net_ns); | 71 | extern struct net *copy_net_ns(unsigned long flags, struct net *net_ns); |