From patchwork Fri Jul 2 20:32:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Marek X-Patchwork-Id: 57774 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DE510B7092 for ; Sat, 3 Jul 2010 06:33:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756340Ab0GBUc2 (ORCPT ); Fri, 2 Jul 2010 16:32:28 -0400 Received: from cantor.suse.de ([195.135.220.2]:45201 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754289Ab0GBUc0 (ORCPT ); Fri, 2 Jul 2010 16:32:26 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id C1B5D95C53; Fri, 2 Jul 2010 22:32:25 +0200 (CEST) Received: by sepie.suse.cz (Postfix, from userid 10020) id 0719F76410; Fri, 2 Jul 2010 22:32:23 +0200 (CEST) From: Michal Marek To: lvs-devel@vger.kernel.org Cc: netdev@vger.kernel.org, Julian Anastasov , Simon Horman , Wensong Zhang , linux-kernel@vger.kernel.org Subject: [PATCH] ipvs: Kconfig cleanup Date: Fri, 2 Jul 2010 22:32:08 +0200 Message-Id: <1278102728-20217-1-git-send-email-mmarek@suse.cz> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org IP_VS_PROTO_AH_ESP should be set iff either of IP_VS_PROTO_{AH,ESP} is selected. Express this with standard kconfig syntax. Signed-off-by: Michal Marek Acked-by: Simon Horman --- net/netfilter/ipvs/Kconfig | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/net/netfilter/ipvs/Kconfig b/net/netfilter/ipvs/Kconfig index f2d7623..91e7373 100644 --- a/net/netfilter/ipvs/Kconfig +++ b/net/netfilter/ipvs/Kconfig @@ -83,19 +83,16 @@ config IP_VS_PROTO_UDP protocol. Say Y if unsure. config IP_VS_PROTO_AH_ESP - bool - depends on UNDEFINED + def_bool IP_VS_PROTO_ESP || IP_VS_PROTO_AH config IP_VS_PROTO_ESP bool "ESP load balancing support" - select IP_VS_PROTO_AH_ESP ---help--- This option enables support for load balancing ESP (Encapsulation Security Payload) transport protocol. Say Y if unsure. config IP_VS_PROTO_AH bool "AH load balancing support" - select IP_VS_PROTO_AH_ESP ---help--- This option enables support for load balancing AH (Authentication Header) transport protocol. Say Y if unsure.