From patchwork Wed Jun 26 09:11:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 254615 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5B3B72C0084 for ; Wed, 26 Jun 2013 19:12:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752538Ab3FZJL5 (ORCPT ); Wed, 26 Jun 2013 05:11:57 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:38965 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752523Ab3FZJLv (ORCPT ); Wed, 26 Jun 2013 05:11:51 -0400 Received: from ayumi.isobedori.kobe.vergenet.net (p1017-ipbfp1604kobeminato.hyogo.ocn.ne.jp [114.154.84.17]) by kirsty.vergenet.net (Postfix) with ESMTP id 29C36266CF1; Wed, 26 Jun 2013 19:11:49 +1000 (EST) Received: by ayumi.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id E00C26CE2AF; Wed, 26 Jun 2013 18:11:46 +0900 (JST) From: Simon Horman To: Pablo Neira Ayuso Cc: lvs-devel@vger.kernel.org, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, Wensong Zhang , Julian Anastasov , JunweiZhang , Nicolas Dichtel , Simon Horman Subject: [PATCH 8/8] netns: exclude ipvs from struct net when IPVS disabled Date: Wed, 26 Jun 2013 18:11:30 +0900 Message-Id: <1372237890-28211-9-git-send-email-horms@verge.net.au> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1372237890-28211-1-git-send-email-horms@verge.net.au> References: <1372237890-28211-1-git-send-email-horms@verge.net.au> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org 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 Signed-off-by: Simon Horman --- 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;