Skip to contentSkip to conversation

mptcp: MPTCP_HMAC_TEST should depend on MPTCP

PATCH Applied Geert Uytterhoeven 3 participants 3 messages Jan 29, 2020 – Jan 30, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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(a)linux-m68k.org>
---
 net/mptcp/Kconfig | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
net/mptcp/Kconfig +4 -2
index 5db56d2218c518c8..49f6054e7f4ebc15 100644
@@ -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
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Geert Uytterhoeven

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(a)linux-m68k.org>

---

Reviewed-by Mat Martineau <mathew.j.martineau(a)linux.intel.com>

--
Mat Martineau
Intel

maintainer Applied
#2 lore raw
In reply to Geert Uytterhoeven

From: Geert Uytterhoeven <geert(a)linux-m68k.org>
Date: Wed, 29 Jan 2020 19:02:24 +0100

Quoted 10 lines

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(a)linux-m68k.org>

Applied.