* [patch 4/8] Use menuconfig objects: SCTP
@ 2007-05-11 5:53 akpm
2007-05-11 13:45 ` Brian Haley
0 siblings, 1 reply; 6+ messages in thread
From: akpm @ 2007-05-11 5:53 UTC (permalink / raw)
To: davem; +Cc: netdev, akpm, jengelh, jengelh, sri, vladislav.yasevich
From: Jan Engelhardt <jengelh@linux01.gwdg.de>
Use menuconfigs instead of menus, so the whole menu can be disabled at once
instead of going through all options.
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Cc: Vlad Yasevich <vladislav.yasevich@hp.com>
Cc: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
net/sctp/Kconfig | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff -puN net/sctp/Kconfig~use-menuconfig-objects-sctp net/sctp/Kconfig
--- a/net/sctp/Kconfig~use-menuconfig-objects-sctp
+++ a/net/sctp/Kconfig
@@ -2,11 +2,9 @@
# SCTP configuration
#
-menu "SCTP Configuration (EXPERIMENTAL)"
- depends on INET && EXPERIMENTAL
-
-config IP_SCTP
+menuconfig IP_SCTP
tristate "The SCTP Protocol (EXPERIMENTAL)"
+ depends on NET && EXPERIMENTAL
depends on IPV6 || IPV6=n
select CRYPTO if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
select CRYPTO_HMAC if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
@@ -36,9 +34,10 @@ config IP_SCTP
If in doubt, say N.
+if IP_SCTP
+
config SCTP_DBG_MSG
bool "SCTP: Debug messages"
- depends on IP_SCTP
help
If you say Y, this will enable verbose debugging messages.
@@ -47,7 +46,6 @@ config SCTP_DBG_MSG
config SCTP_DBG_OBJCNT
bool "SCTP: Debug object counts"
- depends on IP_SCTP
help
If you say Y, this will enable debugging support for counting the
type of objects that are currently allocated. This is useful for
@@ -59,7 +57,6 @@ config SCTP_DBG_OBJCNT
choice
prompt "SCTP: Cookie HMAC Algorithm"
- depends on IP_SCTP
default SCTP_HMAC_MD5
help
HMAC algorithm to be used during association initialization. It
@@ -86,4 +83,5 @@ config SCTP_HMAC_MD5
advised to use either HMAC-MD5 or HMAC-SHA1.
endchoice
-endmenu
+
+endif # IP_SCTP
_
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch 4/8] Use menuconfig objects: SCTP
2007-05-11 5:53 [patch 4/8] Use menuconfig objects: SCTP akpm
@ 2007-05-11 13:45 ` Brian Haley
2007-05-11 14:12 ` Vlad Yasevich
0 siblings, 1 reply; 6+ messages in thread
From: Brian Haley @ 2007-05-11 13:45 UTC (permalink / raw)
To: akpm; +Cc: davem, netdev, jengelh, jengelh, sri, vladislav.yasevich
akpm@linux-foundation.org wrote:
> diff -puN net/sctp/Kconfig~use-menuconfig-objects-sctp net/sctp/Kconfig
> --- a/net/sctp/Kconfig~use-menuconfig-objects-sctp
> +++ a/net/sctp/Kconfig
> @@ -2,11 +2,9 @@
> # SCTP configuration
> #
>
> -menu "SCTP Configuration (EXPERIMENTAL)"
> - depends on INET && EXPERIMENTAL
> -
> -config IP_SCTP
> +menuconfig IP_SCTP
> tristate "The SCTP Protocol (EXPERIMENTAL)"
> + depends on NET && EXPERIMENTAL
> depends on IPV6 || IPV6=n
> select CRYPTO if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
> select CRYPTO_HMAC if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
This just changed "INET && EXPERIMENTAL" to "NET && EXPERIMENTAL", don't
know if that was intended.
-Brian
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch 4/8] Use menuconfig objects: SCTP
2007-05-11 13:45 ` Brian Haley
@ 2007-05-11 14:12 ` Vlad Yasevich
2007-05-11 15:22 ` Jan Engelhardt
0 siblings, 1 reply; 6+ messages in thread
From: Vlad Yasevich @ 2007-05-11 14:12 UTC (permalink / raw)
To: Brian Haley; +Cc: akpm, davem, netdev, jengelh, jengelh, sri
Brian Haley wrote:
> akpm@linux-foundation.org wrote:
>> diff -puN net/sctp/Kconfig~use-menuconfig-objects-sctp net/sctp/Kconfig
>> --- a/net/sctp/Kconfig~use-menuconfig-objects-sctp
>> +++ a/net/sctp/Kconfig
>> @@ -2,11 +2,9 @@
>> # SCTP configuration
>> #
>>
>> -menu "SCTP Configuration (EXPERIMENTAL)"
>> - depends on INET && EXPERIMENTAL
>> -
>> -config IP_SCTP
>> +menuconfig IP_SCTP
>> tristate "The SCTP Protocol (EXPERIMENTAL)"
>> + depends on NET && EXPERIMENTAL
>> depends on IPV6 || IPV6=n
>> select CRYPTO if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
>> select CRYPTO_HMAC if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
>
> This just changed "INET && EXPERIMENTAL" to "NET && EXPERIMENTAL", don't
> know if that was intended.
>
> -Brian
Thanks Brian. This is a bug. This should use INET.
-vlad
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch 4/8] Use menuconfig objects: SCTP
2007-05-11 14:12 ` Vlad Yasevich
@ 2007-05-11 15:22 ` Jan Engelhardt
0 siblings, 0 replies; 6+ messages in thread
From: Jan Engelhardt @ 2007-05-11 15:22 UTC (permalink / raw)
To: Vlad Yasevich; +Cc: Brian Haley, akpm, davem, netdev, sri
On May 11 2007 10:12, Vlad Yasevich wrote:
>Brian Haley wrote:
>> akpm@linux-foundation.org wrote:
>>> diff -puN net/sctp/Kconfig~use-menuconfig-objects-sctp net/sctp/Kconfig
>>> --- a/net/sctp/Kconfig~use-menuconfig-objects-sctp
>>> +++ a/net/sctp/Kconfig
>>> @@ -2,11 +2,9 @@
>>> # SCTP configuration
>>> #
>>>
>>> -menu "SCTP Configuration (EXPERIMENTAL)"
>>> - depends on INET && EXPERIMENTAL
>>> -
>>> -config IP_SCTP
>>> +menuconfig IP_SCTP
>>> tristate "The SCTP Protocol (EXPERIMENTAL)"
>>> + depends on NET && EXPERIMENTAL
>>> depends on IPV6 || IPV6=n
>>> select CRYPTO if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
>>> select CRYPTO_HMAC if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
>>
>> This just changed "INET && EXPERIMENTAL" to "NET && EXPERIMENTAL", don't
>> know if that was intended.
>
>Thanks Brian. This is a bug. This should use INET.
Nobody's perfect :p
Jan
--
^ permalink raw reply [flat|nested] 6+ messages in thread
* [patch 4/8] Use menuconfig objects: SCTP
@ 2007-05-23 21:35 akpm
2007-05-23 21:49 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: akpm @ 2007-05-23 21:35 UTC (permalink / raw)
To: davem; +Cc: netdev, akpm, jengelh, jengelh, sri, vladislav.yasevich
From: Jan Engelhardt <jengelh@linux01.gwdg.de>
Use menuconfigs instead of menus, so the whole menu can be disabled at once
instead of going through all options.
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Cc: Vlad Yasevich <vladislav.yasevich@hp.com>
Cc: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
net/sctp/Kconfig | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff -puN net/sctp/Kconfig~use-menuconfig-objects-sctp net/sctp/Kconfig
--- a/net/sctp/Kconfig~use-menuconfig-objects-sctp
+++ a/net/sctp/Kconfig
@@ -2,11 +2,9 @@
# SCTP configuration
#
-menu "SCTP Configuration (EXPERIMENTAL)"
- depends on INET && EXPERIMENTAL
-
-config IP_SCTP
+menuconfig IP_SCTP
tristate "The SCTP Protocol (EXPERIMENTAL)"
+ depends on INET && EXPERIMENTAL
depends on IPV6 || IPV6=n
select CRYPTO if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
select CRYPTO_HMAC if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
@@ -36,9 +34,10 @@ config IP_SCTP
If in doubt, say N.
+if IP_SCTP
+
config SCTP_DBG_MSG
bool "SCTP: Debug messages"
- depends on IP_SCTP
help
If you say Y, this will enable verbose debugging messages.
@@ -47,7 +46,6 @@ config SCTP_DBG_MSG
config SCTP_DBG_OBJCNT
bool "SCTP: Debug object counts"
- depends on IP_SCTP
help
If you say Y, this will enable debugging support for counting the
type of objects that are currently allocated. This is useful for
@@ -59,7 +57,6 @@ config SCTP_DBG_OBJCNT
choice
prompt "SCTP: Cookie HMAC Algorithm"
- depends on IP_SCTP
default SCTP_HMAC_MD5
help
HMAC algorithm to be used during association initialization. It
@@ -86,4 +83,5 @@ config SCTP_HMAC_MD5
advised to use either HMAC-MD5 or HMAC-SHA1.
endchoice
-endmenu
+
+endif # IP_SCTP
_
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch 4/8] Use menuconfig objects: SCTP
2007-05-23 21:35 akpm
@ 2007-05-23 21:49 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2007-05-23 21:49 UTC (permalink / raw)
To: akpm; +Cc: netdev, jengelh, jengelh, sri, vladislav.yasevich
From: akpm@linux-foundation.org
Date: Wed, 23 May 2007 14:35:54 -0700
> From: Jan Engelhardt <jengelh@linux01.gwdg.de>
>
> Use menuconfigs instead of menus, so the whole menu can be disabled at once
> instead of going through all options.
>
> Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
> Cc: Vlad Yasevich <vladislav.yasevich@hp.com>
> Cc: Sridhar Samudrala <sri@us.ibm.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2007-05-23 21:49 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-11 5:53 [patch 4/8] Use menuconfig objects: SCTP akpm
2007-05-11 13:45 ` Brian Haley
2007-05-11 14:12 ` Vlad Yasevich
2007-05-11 15:22 ` Jan Engelhardt
-- strict thread matches above, loose matches on Subject: below --
2007-05-23 21:35 akpm
2007-05-23 21:49 ` David Miller
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).