From patchwork Wed Oct 21 15:55:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 288230 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=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 EECE9C55178 for ; Wed, 21 Oct 2020 15:56:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8A5BD21D7B for ; Wed, 21 Oct 2020 15:56:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=tessares-net.20150623.gappssmtp.com header.i=@tessares-net.20150623.gappssmtp.com header.b="pw6V1cbz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2444227AbgJUP4O (ORCPT ); Wed, 21 Oct 2020 11:56:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731743AbgJUP4O (ORCPT ); Wed, 21 Oct 2020 11:56:14 -0400 Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com [IPv6:2a00:1450:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0826BC0613CF for ; Wed, 21 Oct 2020 08:56:14 -0700 (PDT) Received: by mail-ej1-x642.google.com with SMTP id a3so3939264ejy.11 for ; Wed, 21 Oct 2020 08:56:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=X0lTiqb5J9sY8vV0icb54lwEDBUajV0UVIORKH6LrNY=; b=pw6V1cbzdJ6aAPDs4ytDbsD7675deQrBlDE7Zfjq8ZmOkksqk1Hx+ZLxaKQ9ApsYk2 ajf9p1fq9yHfime7IrTKw1XLB3KQWxS2WZ1IPfIRysWMvnO4SZPiXJYVjgKjpsJIhcLy nqO0C17hJVeFPG2QqUw/R4TlWfwCkRQG+gQH5TDieG98d4rNzIqDJXpwspF0hMWJQ1od msS/DrstME+3k0Ay4CZqSH4h6vDXu6POv2WgeFrDmPlU0G1AioBxDMofuqAm2vELfMBp Zbv+8AUvs7r+LYacrB3m3zdapjqTB7LpxaCKR1XC/TfCokDx8fzN8FuALYgSbGG+Z0Ju QYug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=X0lTiqb5J9sY8vV0icb54lwEDBUajV0UVIORKH6LrNY=; b=qpf2AdI2IeKLUwxaZcnBgFjJfIwnWUu5pOWIhoiPQdWMrOyiS3gEiAEAN21lrVTvZE BQcx0l2w7dn2ckX//gELKKBgVOVkB7KleYAy14QXoOeSo+ts4Fq9Dnv9Yh69tpSAfIxH D4yUYcss224HJa4HNJxUieWxG3hIZhrNypsgdXrrW0YgtJ8dgsiIUf3Jj9oJ5hNAdulu t6zKBsGSy3oGGsHwAysNXU6hBxBn6XnI00XSD/fFW3KuBVfbqIUgkNZF7alS9yQQk+sb s2mVupMWevh4B03DwaAv1GHsQlrteJu+NVfzdEZ8rwhJ6SJOKTG9P8V9xs4Z3HGF3wTF yBMQ== X-Gm-Message-State: AOAM533G0z6U2m6UtrzeqsngBnNihPCd55Ta16xTNiXJRtlHhhhJak84 ZfG/fAKqdFq8LiWeRZtMCtdUOQ== X-Google-Smtp-Source: ABdhPJySolT9z3HzmY7EyNWZ4ApJyxy/nC5R12XAm8kPOgoop3cN8exiEFcaAdXQ91v6+lomcP7ybA== X-Received: by 2002:a17:906:d159:: with SMTP id br25mr4414045ejb.155.1603295772516; Wed, 21 Oct 2020 08:56:12 -0700 (PDT) Received: from tsr-vdi-mbaerts.nix.tessares.net (static.23.216.130.94.clients.your-server.de. [94.130.216.23]) by smtp.gmail.com with ESMTPSA id k1sm2342278edl.0.2020.10.21.08.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Oct 2020 08:56:11 -0700 (PDT) From: Matthieu Baerts To: Mat Martineau , Matthieu Baerts , "David S. Miller" , Jakub Kicinski , Shuah Khan , Geert Uytterhoeven Cc: netdev@vger.kernel.org, mptcp@lists.01.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net] selftests: mptcp: depends on built-in IPv6 Date: Wed, 21 Oct 2020 17:55:49 +0200 Message-Id: <20201021155549.933731-1-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Recently, CONFIG_MPTCP_IPV6 no longer selects CONFIG_IPV6. As a consequence, if CONFIG_MPTCP_IPV6=y is added to the kconfig, it will no longer ensure CONFIG_IPV6=y. If it is not enabled, CONFIG_MPTCP_IPV6 will stay disabled and selftests will fail. We also need CONFIG_IPV6 to be built-in. For more details, please see commit 0ed37ac586c0 ("mptcp: depends on IPV6 but not as a module"). Note that 'make kselftest-merge' will take all 'config' files found in 'tools/testsing/selftests'. Because some of them already set CONFIG_IPV6=y, MPTCP selftests were still passing. But they will fail if MPTCP selftests are launched manually after having executed this command to prepare the kernel config: ./scripts/kconfig/merge_config.sh -m .config \ ./tools/testing/selftests/net/mptcp/config Fixes: 010b430d5df5 ("mptcp: MPTCP_IPV6 should depend on IPV6 instead of selecting it") Signed-off-by: Matthieu Baerts --- tools/testing/selftests/net/mptcp/config | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/net/mptcp/config b/tools/testing/selftests/net/mptcp/config index 8df5cb8f71ff..741a1c4f4ae8 100644 --- a/tools/testing/selftests/net/mptcp/config +++ b/tools/testing/selftests/net/mptcp/config @@ -1,4 +1,5 @@ CONFIG_MPTCP=y +CONFIG_IPV6=y CONFIG_MPTCP_IPV6=y CONFIG_INET_DIAG=m CONFIG_INET_MPTCP_DIAG=m