netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: junwei.zhang@6wind.com
To: davem@davemloft.net
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 <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	[thread overview]
Message-ID: <1372236006-16683-2-git-send-email-junwei.zhang@6wind.com> (raw)
In-Reply-To: <1372236006-16683-1-git-send-email-junwei.zhang@6wind.com>

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(+)

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

  reply	other threads:[~2013-06-26  8:40 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-21  2:19 [PATCH 1/2] kernel: remove unnecessary head file junwei.zhang
2013-06-21  2:19 ` [PATCH 2/2] netns: exclude ipvs from struct net when IPVS disabled junwei.zhang
2013-06-21  6:40 ` [PATCH 1/2] kernel: remove unnecessary head file Julian Anastasov
2013-06-24  7:23 ` David Miller
2013-06-24  7:24 ` David Miller
2013-06-26  8:40   ` [PATCH v2 net-next " junwei.zhang
2013-06-26  8:40     ` junwei.zhang [this message]
2013-06-26  8:59       ` [PATCH v2 net-next 2/2] netns: exclude ipvs from struct net when IPVS disabled Simon Horman
2013-06-26  8:59     ` [PATCH v2 net-next 1/2] kernel: remove unnecessary head file Simon Horman
2013-06-26  8:58   ` [PATCH " Simon Horman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1372236006-16683-2-git-send-email-junwei.zhang@6wind.com \
    --to=junwei.zhang@6wind.com \
    --cc=davem@davemloft.net \
    --cc=horms@verge.net.au \
    --cc=ja@ssi.bg \
    --cc=lvs-devel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=nicolas.dichtel@6wind.com \
    --cc=wensong@linux-vs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).