diff options
| author |   Geert Uytterhoeven <geert@linux-m68k.org> | 2020-01-29 19:01:17 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-01-30 09:55:37 +0100 |
| commit | 8e1974a2a02bf5b77831c686f01761163ea0cd3e (patch) | |
| tree | d493d1ec90197092c1958af74abf8ae057150c48 /net | |
| parent | Revert "MAINTAINERS: mptcp@ mailing list is moderated" (diff) | |
| download | linux-dev-8e1974a2a02bf5b77831c686f01761163ea0cd3e.tar.xz linux-dev-8e1974a2a02bf5b77831c686f01761163ea0cd3e.zip | |
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@linux-m68k.org>
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mptcp/protocol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 73c192d8c158..3bccee455688 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 |