From patchwork Mon Nov 11 16:53:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Abeni X-Patchwork-Id: 1193026 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=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="QL7ncfPH"; dkim-atps=neutral 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47BcS945Pcz9sR4 for ; Tue, 12 Nov 2019 03:55:05 +1100 (AEDT) Received: from new-ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 15A45100EA554; Mon, 11 Nov 2019 08:56:57 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=205.139.110.120; helo=us-smtp-1.mimecast.com; envelope-from=pabeni@redhat.com; receiver= Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7552D100EA53E for ; Mon, 11 Nov 2019 08:56:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573491300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BdEr6nMeqbps4Hxi+GKdUarkzn/bvDe2uYI19dg8kMo=; b=QL7ncfPHKIxhdF6SR1khOItTEV2uCggXCt6eVFFhuDCulZdOFrKU8lBiLUJywGxd6ouDxX jnhqTLxgeQFw9JU65ueH+vwSB3eCioAchkhPy1vzDhswdpc1terY7jsQ4pbe9h2+ElqNxq te0qUTl2Dln6MWq/AsEdh1m1AyzwG5g= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-50-XogxxhuzP9O58jVf-QC0sQ-1; Mon, 11 Nov 2019 11:54:59 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 930541005500 for ; Mon, 11 Nov 2019 16:54:58 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-119.ams2.redhat.com [10.36.117.119]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B1C718B91 for ; Mon, 11 Nov 2019 16:54:57 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.01.org Date: Mon, 11 Nov 2019 17:53:53 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: XogxxhuzP9O58jVf-QC0sQ-1 X-Mimecast-Spam-Score: 0 Message-ID-Hash: GLGM4IDN4NVVCFX7Y4FU7XG4J5VSSXCU X-Message-ID-Hash: GLGM4IDN4NVVCFX7Y4FU7XG4J5VSSXCU X-MailFrom: pabeni@redhat.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 4/4] mptcp: remove unneeded check in mptcp_established_options_mp() List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: we now have centralized check in mptcp_established_options() Squash-to: "mptcp: Add handling of outgoing MP_JOIN requests" Signed-off-by: Paolo Abeni --- net/mptcp/options.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index e0c6a3b98544..9080a5fed918 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -371,8 +371,7 @@ static bool mptcp_established_options_mp(struct sock *sk, unsigned int *size, pr_debug("subflow=%p, local_key=%llu, remote_key=%llu", subflow, subflow->local_key, subflow->remote_key); return true; - } else if (subflow->mp_join && !subflow->fourth_ack && - remaining >= TCPOLEN_MPTCP_MPJ_ACK) { + } else if (subflow->mp_join && !subflow->fourth_ack) { opts->suboptions = OPTION_MPTCP_MPJ_ACK; memcpy(opts->hmac, subflow->hmac, MPTCPOPT_HMAC_LEN); *size = TCPOLEN_MPTCP_MPJ_ACK;