diff options
| author |   Matthieu Baerts <matthieu.baerts@tessares.net> | 2020-10-21 17:55:49 +0200 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2020-10-21 20:39:58 -0700 |
| commit | 287d35405989cfe0090e3059f7788dc531879a8d (patch) | |
| tree | f8f4077dc621145e4aae48ec85f4668cf7fa7c85 /tools/testing/selftests/net/mptcp/config | |
| parent | Revert "virtio-net: ethtool configurable RXCSUM" (diff) | |
| download | wireguard-linux-287d35405989cfe0090e3059f7788dc531879a8d.tar.xz wireguard-linux-287d35405989cfe0090e3059f7788dc531879a8d.zip | |
selftests: mptcp: depends on built-in IPv6
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 <matthieu.baerts@tessares.net>
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Link: https://lore.kernel.org/r/20201021155549.933731-1-matthieu.baerts@tessares.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | tools/testing/selftests/net/mptcp/config | 1 |
1 files changed, 1 insertions, 0 deletions
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 |