2020-01-29 18:47:28

by Geert Uytterhoeven

Subject: [PATCH] mptcp: Fix incorrect IPV6 dependency check

If CONFIG_MPTCP=y, CONFIG_MPTCP_IPV6=n, and CONFIG_IPV6=m:

net/mptcp/protocol.o: In function `__mptcp_tcp_fallback':
protocol.c:(.text+0x786): undefined reference to `inet6_stream_ops'

Fix this by checking for CONFIG_MPTCP_IPV6 instead of CONFIG_IPV6, like
is done in all other places in the mptcp code.

Fixes: 8ab183deb26a3b79 ("mptcp: cope with later TCP fallback")
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
net/mptcp/protocol.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 39fdca79ce90137e..096dfd1074540c8a 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -28,7 +28,7 @@ static void __mptcp_close(struct sock *sk, long timeout);

static const struct proto_ops *tcp_proto_ops(struct sock *sk)
{
-#if IS_ENABLED(CONFIG_IPV6)
+#if IS_ENABLED(CONFIG_MPTCP_IPV6)
if (sk->sk_family == AF_INET6)
return &inet6_stream_ops;
#endif
--
2.17.1

2020-01-29 21:11:32

by Mat Martineau

Subject: Re: [PATCH] mptcp: Fix incorrect IPV6 dependency check

On Wed, 29 Jan 2020, Geert Uytterhoeven wrote:

> If CONFIG_MPTCP=y, CONFIG_MPTCP_IPV6=n, and CONFIG_IPV6=m:
>
> net/mptcp/protocol.o: In function `__mptcp_tcp_fallback':
> protocol.c:(.text+0x786): undefined reference to `inet6_stream_ops'
>
> Fix this by checking for CONFIG_MPTCP_IPV6 instead of CONFIG_IPV6, like
> is done in all other places in the mptcp code.
>
> Fixes: 8ab183deb26a3b79 ("mptcp: cope with later TCP fallback")
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> ---

Reviewed-by: Mat Martineau <[email protected]>


--
Mat Martineau
Intel

2020-01-30 08:57:33

by David Miller

Subject: Re: [PATCH] mptcp: Fix incorrect IPV6 dependency check

From: Geert Uytterhoeven <[email protected]>
Date: Wed, 29 Jan 2020 19:01:17 +0100

> If CONFIG_MPTCP=y, CONFIG_MPTCP_IPV6=n, and CONFIG_IPV6=m:
>
> net/mptcp/protocol.o: In function `__mptcp_tcp_fallback':
> protocol.c:(.text+0x786): undefined reference to `inet6_stream_ops'
>
> Fix this by checking for CONFIG_MPTCP_IPV6 instead of CONFIG_IPV6, like
> is done in all other places in the mptcp code.
>
> Fixes: 8ab183deb26a3b79 ("mptcp: cope with later TCP fallback")
> Signed-off-by: Geert Uytterhoeven <[email protected]>

Applied.