From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E085C2D0DB for ; Wed, 29 Jan 2020 18:02:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A222206D4 for ; Wed, 29 Jan 2020 18:02:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727341AbgA2SC2 (ORCPT ); Wed, 29 Jan 2020 13:02:28 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:36684 "EHLO michel.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726871AbgA2SC2 (ORCPT ); Wed, 29 Jan 2020 13:02:28 -0500 Received: from ramsan ([84.195.182.253]) by michel.telenet-ops.be with bizsmtp id wJ2R2100B5USYZQ06J2Rzn; Wed, 29 Jan 2020 19:02:25 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan with esmtp (Exim 4.90_1) (envelope-from ) id 1iwrfV-0005nY-99; Wed, 29 Jan 2020 19:02:25 +0100 Received: from geert by rox.of.borg with local (Exim 4.90_1) (envelope-from ) id 1iwrfV-0000C1-6p; Wed, 29 Jan 2020 19:02:25 +0100 From: Geert Uytterhoeven To: Paolo Abeni , Christoph Paasch , Mat Martineau , Matthieu Baerts , "David S . Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, mptcp@lists.01.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH] mptcp: MPTCP_HMAC_TEST should depend on MPTCP Date: Wed, 29 Jan 2020 19:02:24 +0100 Message-Id: <20200129180224.700-1-geert@linux-m68k.org> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- net/mptcp/Kconfig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/mptcp/Kconfig b/net/mptcp/Kconfig index 5db56d2218c518c8..49f6054e7f4ebc15 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 -- 2.17.1