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 <[email protected]>
---
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
--
2.17.1
Hi Geert,
On 21/10/2020 11:43, Geert Uytterhoeven wrote:
> Hi Jakub,
>
> On Wed, Oct 21, 2020 at 5:56 AM Jakub Kicinski <[email protected]> wrote:
>> On Tue, 20 Oct 2020 11:26:34 +0200 Matthieu Baerts wrote:
>>> On 20/10/2020 09:38, Geert Uytterhoeven wrote:
>>>> 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.
>>>
>>> Here again, the intension was to select IPv6 from MPTCP but I understand
>>> the issue: if we enable MPTCP, we will select IPV6 as well by default.
>>> Maybe not what we want on some embedded devices with very limited memory
>>> where IPV6 is already off. We should instead enable MPTCP_IPV6 only if
>>> IPV6=y. LGTM then!
>>>
>>> Reviewed-by: Matthieu Baerts <[email protected]>
>>
>> Applied, thanks!
>
> My apologies, this fails for the CONFIG_IPV6=m and CONFIG_MPTCP=y
> case:
Good point, MPTCP cannot be compiled as a module (like TCP). It should
then depends on IPV6=y. I thought it would be the case.
Do you want me to send a patch or do you already have one?
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
http://www.tessares.net
Hi Matthieu,
On Wed, Oct 21, 2020 at 11:47 AM Matthieu Baerts
<[email protected]> wrote:
> On 21/10/2020 11:43, Geert Uytterhoeven wrote:
> > On Wed, Oct 21, 2020 at 5:56 AM Jakub Kicinski <[email protected]> wrote:
> >> On Tue, 20 Oct 2020 11:26:34 +0200 Matthieu Baerts wrote:
> >>> On 20/10/2020 09:38, Geert Uytterhoeven wrote:
> >>>> 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.
> >>>
> >>> Here again, the intension was to select IPv6 from MPTCP but I understand
> >>> the issue: if we enable MPTCP, we will select IPV6 as well by default.
> >>> Maybe not what we want on some embedded devices with very limited memory
> >>> where IPV6 is already off. We should instead enable MPTCP_IPV6 only if
> >>> IPV6=y. LGTM then!
> >>>
> >>> Reviewed-by: Matthieu Baerts <[email protected]>
> >>
> >> Applied, thanks!
> >
> > My apologies, this fails for the CONFIG_IPV6=m and CONFIG_MPTCP=y
> > case:
>
> Good point, MPTCP cannot be compiled as a module (like TCP). It should
> then depends on IPV6=y. I thought it would be the case.
>
> Do you want me to send a patch or do you already have one?
I don't have a patch yet, so feel free to send one.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Hi Geert,
On 21/10/2020 11:52, Geert Uytterhoeven wrote:
> Hi Matthieu,
>
> On Wed, Oct 21, 2020 at 11:47 AM Matthieu Baerts
> <[email protected]> wrote:
>> On 21/10/2020 11:43, Geert Uytterhoeven wrote:
>>> On Wed, Oct 21, 2020 at 5:56 AM Jakub Kicinski <[email protected]> wrote:
>>>> On Tue, 20 Oct 2020 11:26:34 +0200 Matthieu Baerts wrote:
>>>>> On 20/10/2020 09:38, Geert Uytterhoeven wrote:
>>>>>> 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.
>>>>>
>>>>> Here again, the intension was to select IPv6 from MPTCP but I understand
>>>>> the issue: if we enable MPTCP, we will select IPV6 as well by default.
>>>>> Maybe not what we want on some embedded devices with very limited memory
>>>>> where IPV6 is already off. We should instead enable MPTCP_IPV6 only if
>>>>> IPV6=y. LGTM then!
>>>>>
>>>>> Reviewed-by: Matthieu Baerts <[email protected]>
>>>>
>>>> Applied, thanks!
>>>
>>> My apologies, this fails for the CONFIG_IPV6=m and CONFIG_MPTCP=y
>>> case:
>>
>> Good point, MPTCP cannot be compiled as a module (like TCP). It should
>> then depends on IPV6=y. I thought it would be the case.
>>
>> Do you want me to send a patch or do you already have one?
>
> I don't have a patch yet, so feel free to send one.
Just did:
https://lore.kernel.org/netdev/[email protected]/
Groetjes,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
http://www.tessares.net