From patchwork Tue Nov 5 19:05:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Krystad X-Patchwork-Id: 1189893 X-Patchwork-Delegate: matthieu.baerts@tessares.net 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=2001:19d0:306:5::1; 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.intel.com Received: from ml01.01.org (ml01.01.org [IPv6:2001:19d0:306:5::1]) (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 476zf606BRz9sNx for ; Wed, 6 Nov 2019 06:06:05 +1100 (AEDT) Received: from new-ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id E4337100DC433; Tue, 5 Nov 2019 11:08:42 -0800 (PST) Received-SPF: None (mailfrom) identity=mailfrom; client-ip=134.134.136.100; helo=mga07.intel.com; envelope-from=peter.krystad@linux.intel.com; receiver= Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id F00FA100DC42C for ; Tue, 5 Nov 2019 11:08:40 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Nov 2019 11:05:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,271,1569308400"; d="scan'208";a="227215641" Received: from pkrystad-mobl4.sea.intel.com (HELO localhost.localdomain) ([10.252.132.183]) by fmsmga004.fm.intel.com with ESMTP; 05 Nov 2019 11:05:59 -0800 From: Peter Krystad To: mptcp@lists.01.org Date: Tue, 5 Nov 2019 11:05:54 -0800 Message-Id: <20191105190557.6405-2-peter.krystad@linux.intel.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20191105190557.6405-1-peter.krystad@linux.intel.com> References: <20191105190557.6405-1-peter.krystad@linux.intel.com> Message-ID-Hash: TD7B3TEPL652FOJDFCYIKQOR267U5AM3 X-Message-ID-Hash: TD7B3TEPL652FOJDFCYIKQOR267U5AM3 X-MailFrom: peter.krystad@linux.intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [PATCH 2/5] mptcp: Switch to CONFIG_MPTCP_IPV6 List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 squashto: Add handling of outgoing MP_JOIN requests Signed-off-by: Peter Krystad --- net/mptcp/subflow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 7bae7c35ea6b..704dfc49f0d5 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -646,7 +646,7 @@ int mptcp_subflow_connect(struct sock *sk, struct sockaddr *local, release_sock(sk); addrlen = sizeof(struct sockaddr_in); -#if IS_ENABLED(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_MPTCP_IPV6) if (local->sa_family == AF_INET6) addrlen = sizeof(struct sockaddr_in6); #endif