Patchwork [11/12] netns: exclude ipvs from struct net when IPVS disabled

login
register
mail settings
Submitter Pablo Neira
Date June 30, 2013, 11:54 p.m.
Message ID <1372636481-3705-12-git-send-email-pablo@netfilter.org>
Download mbox | patch
Permalink /patch/255965/
State Accepted
Headers show

Comments

Pablo Neira - June 30, 2013, 11:54 p.m.
From: JunweiZhang <junwei.zhang@6wind.com>

no real problem is fixed, just save a few bytes in
net_namespace structure.

Signed-off-by: JunweiZhang <junwei.zhang@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Reviewed-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 include/net/net_namespace.h |    2 ++
 1 file changed, 2 insertions(+)

Patch

diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 495bc57..84e37b1 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -115,7 +115,9 @@  struct net {
 #ifdef CONFIG_XFRM
 	struct netns_xfrm	xfrm;
 #endif
+#if IS_ENABLED(CONFIG_IP_VS)
 	struct netns_ipvs	*ipvs;
+#endif
 	struct sock		*diag_nlsk;
 	atomic_t		rt_genid;
 	atomic_t		fnhe_genid;