2010-07-02 20:32:28

by Michal Marek

Subject: [PATCH] ipvs: Kconfig cleanup

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 <[email protected]>
---
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.
--
1.7.1

2010-07-04 07:13:53

by Simon Horman

Subject: Re: [PATCH] ipvs: Kconfig cleanup

[ Added Patrick McHardy to CC ]

On Sun, Jul 04, 2010 at 04:05:16PM +0900, Simon Horman wrote:
> On Fri, Jul 02, 2010 at 10:32:08PM +0200, Michal Marek wrote:
> > 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 <[email protected]>
>
> Acked-by: Simon Horman <[email protected]>
>
> > ---
> > 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.
> > --
> > 1.7.1
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
> > the body of a message to [email protected]
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2010-07-04 07:27:54

by Simon Horman

Subject: Re: [PATCH] ipvs: Kconfig cleanup

On Fri, Jul 02, 2010 at 10:32:08PM +0200, Michal Marek wrote:
> 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 <[email protected]>

Acked-by: Simon Horman <[email protected]>

> ---
> 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.
> --
> 1.7.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2010-07-05 08:43:08

by Patrick McHardy

Subject: Re: [PATCH] ipvs: Kconfig cleanup

Simon Horman wrote:
> [ Added Patrick McHardy to CC ]
>
> On Sun, Jul 04, 2010 at 04:05:16PM +0900, Simon Horman wrote:
>
>> On Fri, Jul 02, 2010 at 10:32:08PM +0200, Michal Marek wrote:
>>
>>> 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 <[email protected]>
>>>
>> Acked-by: Simon Horman <[email protected]>

Applied, thanks.