summaryrefslogtreecommitdiffstats
path: root/net/mptcp
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2020-01-29 19:02:24 +0100
committerDavid S. Miller <davem@davemloft.net>2020-01-30 09:55:37 +0100
commit389b8fb3c4befcc42edbc6d40525c6cb7704daf8 (patch)
treeaca419d0a71749bb7ae46935d18865e2ed57b9f1 /net/mptcp
parentmptcp: Fix incorrect IPV6 dependency check (diff)
downloadlinux-389b8fb3c4befcc42edbc6d40525c6cb7704daf8.tar.xz
linux-389b8fb3c4befcc42edbc6d40525c6cb7704daf8.zip
mptcp: MPTCP_HMAC_TEST should depend on MPTCP
As the MPTCP HMAC test is integrated into the MPTCP code, it can be built only when MPTCP is enabled. Hence when MPTCP is disabled, asking the user if the test code should be enabled is futile. Wrap the whole block of MPTCP-specific config options inside a check for MPTCP. While at it, drop the "default n" for MPTCP_HMAC_TEST, as that is the default anyway. Fixes: 65492c5a6ab5df50 ("mptcp: move from sha1 (v0) to sha256 (v1)") Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp')
-rw-r--r--net/mptcp/Kconfig6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/mptcp/Kconfig b/net/mptcp/Kconfig
index 5db56d2218c5..49f6054e7f4e 100644
--- a/net/mptcp/Kconfig
+++ b/net/mptcp/Kconfig
@@ -10,17 +10,19 @@ config MPTCP
uses the TCP protocol, and TCP options carry header information for
MPTCP.
+if MPTCP
+
config MPTCP_IPV6
bool "MPTCP: IPv6 support for Multipath TCP"
- depends on MPTCP
select IPV6
default y
config MPTCP_HMAC_TEST
bool "Tests for MPTCP HMAC implementation"
- default n
help
This option enable boot time self-test for the HMAC implementation
used by the MPTCP code
Say N if you are unsure.
+
+endif