mptcp: Fix incorrect IPV6 dependency check
Subsystems (3)
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.
--- net/mptcp/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mptcp/protocol.c +1 -1
@@ -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
Quoted 11 lines · Geert Uytterhoeven
If
CONFIG_MPTCP=y,CONFIG_MPTCP_IPV6=n, andCONFIG_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_IPV6instead ofCONFIG_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>---
--
Mat Martineau
Intel
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, andCONFIG_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_IPV6instead ofCONFIG_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.