diff mbox

[v2,net-next,2/2] netns: exclude ipvs from struct net when IPVS disabled

Message ID 1372236006-16683-2-git-send-email-junwei.zhang@6wind.com
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

junwei.zhang@6wind.com June 26, 2013, 8:40 a.m. UTC 
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>

---
v2: rebase on net-next
 include/net/net_namespace.h | 2 ++
 1 file changed, 2 insertions(+)

Comments

Simon Horman June 26, 2013, 8:59 a.m. UTC | #1 
On Wed, Jun 26, 2013 at 04:40:06PM +0800, junwei.zhang@6wind.com wrote:
> 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>

Thanks, applied to ipvs-next.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

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;