diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-03-10 18:23:10 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 18:52:40 -0500 |
commit | 8467005da3ef6104b89a4cc5e9c9d9445b75565f (patch) | |
tree | e21eb9f439a9e17e66d90c691f400db3a5b0c54d /include/net | |
parent | 13aa9a6b0f2371d2ce0de57c2ede62ab7a787157 (diff) |
nsproxy: remove INIT_NSPROXY()
Remove INIT_NSPROXY(), use C99 initializer.
Remove INIT_IPC_NS(), INIT_NET_NS() while I'm at it.
Note: headers trim will be done later, now it's quite pointless because
results will be invalidated by merge window.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/net_namespace.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 82b7be4db89a..bd10a7908993 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h | |||
@@ -100,14 +100,9 @@ struct net { | |||
100 | extern struct net init_net; | 100 | extern struct net init_net; |
101 | 101 | ||
102 | #ifdef CONFIG_NET | 102 | #ifdef CONFIG_NET |
103 | #define INIT_NET_NS(net_ns) .net_ns = &init_net, | ||
104 | |||
105 | extern struct net *copy_net_ns(unsigned long flags, struct net *net_ns); | 103 | extern struct net *copy_net_ns(unsigned long flags, struct net *net_ns); |
106 | 104 | ||
107 | #else /* CONFIG_NET */ | 105 | #else /* CONFIG_NET */ |
108 | |||
109 | #define INIT_NET_NS(net_ns) | ||
110 | |||
111 | static inline struct net *copy_net_ns(unsigned long flags, struct net *net_ns) | 106 | static inline struct net *copy_net_ns(unsigned long flags, struct net *net_ns) |
112 | { | 107 | { |
113 | /* There is nothing to copy so this is a noop */ | 108 | /* There is nothing to copy so this is a noop */ |