Skip to contentSkip to conversation

mptcp: Fix incorrect IPV6 dependency check

PATCH Applied Geert Uytterhoeven 3 participants 3 messages Jan 29, 2020 – Jan 30, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 <geert(a)linux-m68k.org>
---
 net/mptcp/protocol.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/mptcp/protocol.c +1 -1
index 39fdca79ce90137e..096dfd1074540c8a 100644
@@ -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
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · 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(a)linux-m68k.org>

---

Reviewed-by Mat Martineau <mathew.j.martineau(a)linux.intel.com>

--
Mat Martineau
Intel

maintainer Applied
#2 lore raw
In reply to Geert Uytterhoeven

From: Geert Uytterhoeven <geert(a)linux-m68k.org>
Date: Wed, 29 Jan 2020 19:01:17 +0100

Quoted 10 lines

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(a)linux-m68k.org>

Applied.