diff options
author | Alex Elder <elder@inktank.com> | 2013-01-07 10:47:46 -0600 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-07 09:27:06 -0800 |
commit | 36a25de23359940b7713fc40cbcbb046b3797511 (patch) | |
tree | 5f9184354f39e32a100d7762a070d9e949dedde6 /net | |
parent | f77637206d7b24d5701715433e8d28da64d8d998 (diff) | |
download | linux-3.10-36a25de23359940b7713fc40cbcbb046b3797511.tar.gz linux-3.10-36a25de23359940b7713fc40cbcbb046b3797511.tar.bz2 linux-3.10-36a25de23359940b7713fc40cbcbb046b3797511.zip |
sctp: fix Kconfig bug in default cookie hmac selection
Commit 0d0863b02002 ("sctp: Change defaults on cookie hmac selection")
added a "choice" to the sctp Kconfig file. It introduced a bug which
led to an infinite loop when while running "make oldconfig".
The problem is that the wrong symbol was defined as the default value
for the choice. Using the correct value gets rid of the infinite loop.
Note: if CONFIG_SCTP_COOKIE_HMAC_SHA1=y was present in the input
config file, both that and CONFIG_SCTP_COOKIE_HMAC_MD5=y be present
in the generated config file.
Signed-off-by: Alex Elder <elder@inktank.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/sctp/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/Kconfig b/net/sctp/Kconfig index c26210618e1..7521d944c0f 100644 --- a/net/sctp/Kconfig +++ b/net/sctp/Kconfig @@ -68,7 +68,7 @@ config SCTP_DBG_OBJCNT If unsure, say N choice prompt "Default SCTP cookie HMAC encoding" - default SCTP_COOKIE_HMAC_MD5 + default SCTP_DEFAULT_COOKIE_HMAC_MD5 help This option sets the default sctp cookie hmac algorithm when in doubt select 'md5' |