* [PATCH] mptcp: Fix incorrect IPV6 dependency check
@ 2020-01-29 18:01 Geert Uytterhoeven
2020-01-29 21:10 ` Mat Martineau
2020-01-30 8:56 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Geert Uytterhoeven @ 2020-01-29 18:01 UTC (permalink / raw)
To: Paolo Abeni, Florian Westphal, Christoph Paasch, Mat Martineau,
Matthieu Baerts, David S . Miller, Jakub Kicinski
Cc: netdev, mptcp, linux-kernel, Geert Uytterhoeven
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 <geert@linux-m68k.org>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mptcp: Fix incorrect IPV6 dependency check
2020-01-29 18:01 [PATCH] mptcp: Fix incorrect IPV6 dependency check Geert Uytterhoeven
@ 2020-01-29 21:10 ` Mat Martineau
2020-01-30 8:56 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Mat Martineau @ 2020-01-29 21:10 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Paolo Abeni, Florian Westphal, Christoph Paasch, Matthieu Baerts,
David S . Miller, Jakub Kicinski, netdev, mptcp, linux-kernel
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 <geert@linux-m68k.org>
> ---
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
--
Mat Martineau
Intel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mptcp: Fix incorrect IPV6 dependency check
2020-01-29 18:01 [PATCH] mptcp: Fix incorrect IPV6 dependency check Geert Uytterhoeven
2020-01-29 21:10 ` Mat Martineau
@ 2020-01-30 8:56 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2020-01-30 8:56 UTC (permalink / raw)
To: geert
Cc: pabeni, fw, cpaasch, mathew.j.martineau, matthieu.baerts, kuba,
netdev, mptcp, linux-kernel
From: Geert Uytterhoeven <geert@linux-m68k.org>
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 <geert@linux-m68k.org>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-30 8:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-29 18:01 [PATCH] mptcp: Fix incorrect IPV6 dependency check Geert Uytterhoeven
2020-01-29 21:10 ` Mat Martineau
2020-01-30 8:56 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).