From 3f110a82f0114f78b8cb7e9c73610a360689e07d Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Mon, 5 Jul 2010 10:42:37 +0200 Subject: [PATCH] --- yaml --- r: 203964 b: refs/heads/master c: 72c7664f9278b31fcf6b7828c1417caca5b68104 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/netfilter/ipvs/Kconfig | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 24435567647f..43702970440f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b13b7125e4d10ce39818eec1bcb2d9777d29475f +refs/heads/master: 72c7664f9278b31fcf6b7828c1417caca5b68104 diff --git a/trunk/net/netfilter/ipvs/Kconfig b/trunk/net/netfilter/ipvs/Kconfig index 712ccad13344..d80b41abec09 100644 --- a/trunk/net/netfilter/ipvs/Kconfig +++ b/trunk/net/netfilter/ipvs/Kconfig @@ -87,19 +87,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.