From patchwork Tue Oct 20 07:38:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 1384682 X-Patchwork-Delegate: matthieu.baerts@tessares.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=2001:19d0:306:5::1; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux-m68k.org Received: from ml01.01.org (ml01.01.org [IPv6:2001:19d0:306:5::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CFlqg1NSBz9sPB for ; Tue, 20 Oct 2020 18:38:54 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 2CB3815F53E43; Tue, 20 Oct 2020 00:38:50 -0700 (PDT) Received-SPF: None (mailfrom) identity=mailfrom; client-ip=2a02:1800:120:4::f00:13; helo=baptiste.telenet-ops.be; envelope-from=geert@linux-m68k.org; receiver= Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D174115F4B29B for ; Tue, 20 Oct 2020 00:38:45 -0700 (PDT) Received: from ramsan ([84.195.186.194]) by baptiste.telenet-ops.be with bizsmtp id i7ei230074C55Sk017eiU3; Tue, 20 Oct 2020 09:38:42 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan with esmtp (Exim 4.90_1) (envelope-from ) id 1kUmEE-0004U3-2V; Tue, 20 Oct 2020 09:38:42 +0200 Received: from geert by rox.of.borg with local (Exim 4.90_1) (envelope-from ) id 1kUmEE-0007c7-1F; Tue, 20 Oct 2020 09:38:42 +0200 From: Geert Uytterhoeven To: Mat Martineau , Matthieu Baerts , "David S . Miller" , Jakub Kicinski , Florian Westphal , Peter Krystad Date: Tue, 20 Oct 2020 09:38:39 +0200 Message-Id: <20201020073839.29226-1-geert@linux-m68k.org> X-Mailer: git-send-email 2.17.1 Message-ID-Hash: F4FCMH6Y6F5ALCLZZUM3V4YYIKU5SCTV X-Message-ID-Hash: F4FCMH6Y6F5ALCLZZUM3V4YYIKU5SCTV X-MailFrom: geert@linux-m68k.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation CC: netdev@vger.kernel.org, mptcp@lists.01.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [PATCH] mptcp: MPTCP_IPV6 should depend on IPV6 instead of selecting it List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 MPTCP_IPV6 selects IPV6, thus enabling an optional feature the user may not want to enable. Fix this by making MPTCP_IPV6 depend on IPV6, like is done for all other IPv6 features. Fixes: f870fa0b5768842c ("mptcp: Add MPTCP socket stubs") Signed-off-by: Geert Uytterhoeven Reviewed-by: Matthieu Baerts --- net/mptcp/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mptcp/Kconfig b/net/mptcp/Kconfig index abb0a992d4a0855a..8936604b3bf9d76d 100644 --- a/net/mptcp/Kconfig +++ b/net/mptcp/Kconfig @@ -19,7 +19,7 @@ config INET_MPTCP_DIAG config MPTCP_IPV6 bool "MPTCP: IPv6 support for Multipath TCP" - select IPV6 + depends on IPV6 default y config MPTCP_KUNIT_TESTS