diff options
Diffstat (limited to 'include/net/net_namespace.h')
| -rw-r--r-- | include/net/net_namespace.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index f307e133d14c..bd10a7908993 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h | |||
| @@ -81,6 +81,8 @@ struct net { | |||
| 81 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) | 81 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) |
| 82 | struct netns_ct ct; | 82 | struct netns_ct ct; |
| 83 | #endif | 83 | #endif |
| 84 | struct sock *nfnl; | ||
| 85 | struct sock *nfnl_stash; | ||
| 84 | #endif | 86 | #endif |
| 85 | #ifdef CONFIG_XFRM | 87 | #ifdef CONFIG_XFRM |
| 86 | struct netns_xfrm xfrm; | 88 | struct netns_xfrm xfrm; |
| @@ -98,14 +100,9 @@ struct net { | |||
| 98 | extern struct net init_net; | 100 | extern struct net init_net; |
| 99 | 101 | ||
| 100 | #ifdef CONFIG_NET | 102 | #ifdef CONFIG_NET |
| 101 | #define INIT_NET_NS(net_ns) .net_ns = &init_net, | ||
| 102 | |||
| 103 | 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); |
| 104 | 104 | ||
| 105 | #else /* CONFIG_NET */ | 105 | #else /* CONFIG_NET */ |
| 106 | |||
| 107 | #define INIT_NET_NS(net_ns) | ||
| 108 | |||
| 109 | 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) |
| 110 | { | 107 | { |
| 111 | /* There is nothing to copy so this is a noop */ | 108 | /* There is nothing to copy so this is a noop */ |
