summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunweiZhang <junwei.zhang@6wind.com>2013-06-26 16:40:06 +0800
committerSimon Horman <horms@verge.net.au>2013-06-26 18:01:46 +0900
commit8b4d14d8eb36874daf159d33dcccd4746a6f3189 (patch)
tree45a0e3f6d7f747990a25f16e7d79ea534badf1a8
parentd0667186eb0eab78dcca9f75af6ed03873ca8d9f (diff)
downloadop-kernel-dev-8b4d14d8eb36874daf159d33dcccd4746a6f3189.zip
op-kernel-dev-8b4d14d8eb36874daf159d33dcccd4746a6f3189.tar.gz
netns: exclude ipvs from struct net when IPVS disabled
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>
-rw-r--r--include/net/net_namespace.h2
1 files changed, 2 insertions, 0 deletions
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;
OpenPOWER on IntegriCloud