From patchwork Wed Jan 29 18:01:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 1231044 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=198.145.21.10; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux-m68k.org Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 487BBG39blz9sQp for ; Thu, 30 Jan 2020 05:01:26 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 2FA7E10097E04; Wed, 29 Jan 2020 10:04:42 -0800 (PST) Received-SPF: None (mailfrom) identity=mailfrom; client-ip=2a02:1800:120:4::f00:13; helo=baptiste.telenet-ops.be; envelope-from=geert@linux-m68k.org; receiver= Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E762610097DF6 for ; Wed, 29 Jan 2020 10:04:40 -0800 (PST) Received: from ramsan ([84.195.182.253]) by baptiste.telenet-ops.be with bizsmtp id wJ1J2100R5USYZQ01J1JeL; Wed, 29 Jan 2020 19:01:20 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan with esmtp (Exim 4.90_1) (envelope-from ) id 1iwreQ-0005lk-Ft; Wed, 29 Jan 2020 19:01:18 +0100 Received: from geert by rox.of.borg with local (Exim 4.90_1) (envelope-from ) id 1iwreQ-00009c-D9; Wed, 29 Jan 2020 19:01:18 +0100 From: Geert Uytterhoeven To: Paolo Abeni , Florian Westphal , Christoph Paasch , Mat Martineau , Matthieu Baerts , "David S . Miller" , Jakub Kicinski Date: Wed, 29 Jan 2020 19:01:17 +0100 Message-Id: <20200129180117.545-1-geert@linux-m68k.org> X-Mailer: git-send-email 2.17.1 Message-ID-Hash: YPLY3B3B7WT56WCIZT6DDFEJ3R6YUVI3 X-Message-ID-Hash: YPLY3B3B7WT56WCIZT6DDFEJ3R6YUVI3 X-MailFrom: geert@linux-m68k.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation CC: netdev@vger.kernel.org, mptcp@lists.01.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [PATCH] mptcp: Fix incorrect IPV6 dependency check List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 Reviewed-by: Mat Martineau --- 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