From mboxrd@z Thu Jan 1 00:00:00 1970 From: junwei.zhang@6wind.com Subject: [PATCH v2 net-next 2/2] netns: exclude ipvs from struct net when IPVS disabled Date: Wed, 26 Jun 2013 16:40:06 +0800 Message-ID: <1372236006-16683-2-git-send-email-junwei.zhang@6wind.com> References: <20130624.002401.1459814761780281188.davem@davemloft.net> <1372236006-16683-1-git-send-email-junwei.zhang@6wind.com> Cc: wensong@linux-vs.org, horms@verge.net.au, ja@ssi.bg, netdev@vger.kernel.org, lvs-devel@vger.kernel.org, nicolas.dichtel@6wind.com, JunweiZhang To: davem@davemloft.net Return-path: Received: from mail-pb0-f41.google.com ([209.85.160.41]:33568 "EHLO mail-pb0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751619Ab3FZIku (ORCPT ); Wed, 26 Jun 2013 04:40:50 -0400 Received: by mail-pb0-f41.google.com with SMTP id rp16so13998346pbb.28 for ; Wed, 26 Jun 2013 01:40:50 -0700 (PDT) In-Reply-To: <1372236006-16683-1-git-send-email-junwei.zhang@6wind.com> Sender: netdev-owner@vger.kernel.org List-ID: From: JunweiZhang no real problem is fixed, just save a few bytes in net_namespace structure. Signed-off-by: JunweiZhang Signed-off-by: Nicolas Dichtel Reviewed-by: Julian Anastasov --- v2: rebase on net-next include/net/net_namespace.h | 2 ++ 1 file changed, 2 insertions(+) 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; -- 1.8.1.2