From nobody Thu Apr 25 15:45:59 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:1d48:0:0:0:0:0 with SMTP id 69csp2273656jaj; Mon, 6 Sep 2021 02:41:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysbd3xcQbOMZeyYro+wU+F7jiPPgZywetlzr465V1Nyfh/r7Q6R2C0JbjhBD9i+c+8+eC+ X-Received: by 2002:a63:6f42:: with SMTP id k63mr11211855pgc.358.1630921292748; Mon, 06 Sep 2021 02:41:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630921292; cv=none; d=google.com; s=arc-20160816; b=wSuUvMzWokx2IxPuU8gNIjXOayHnK8I8P33pMZIKIDpxyNa0O/MvhtTmnADL52iAcG QkLuSML3SkcvtxR3Euy+b0vry02kWgGRHWVJ7dRu2SrqC4PyMjuELF80ygmuK7eLJguw ChCU1/ZVfR7hfVqq7x4d8IXy6rsjVLez+QpW9NCtYw4BZuLAGZuZowzxq9p6NRHS7Awd BeiJ0meiN0O7cUkPUiB5+3ZUXAfF+/WRHQ9/zsdJ4uTEiv9h2t3ckiqEp+rZ4E/upRfx dcIXN2/OuqFBwLz8dY1IB5EpNRQ7WWK5jcgyC8JZUv3i7LySdHZeS9HuyJcYCn3CZYGZ ee7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:to:from :dkim-signature; bh=Uz0teKYvVl8MQPi1nUSalB6FarhhgxQmn5UIoqEVeu4=; b=ZOVZ6QUC+sLkTVxKFJ6aVwXc+t3Qm2aASLeJtPwGORRB2hIDDAgO0Nw40meRgz5CTY ScCAZwJ52xiWGYXOmUiMQ3pf//EwSug70scNZW7/74m0GOZ2xZ+4xJgCFbkY+Bvf6K6Q OD4bnlcVm5saXKOxeatIdljBOC8hJkAF7saW3BzPbXwglnG+Xu2VsfZrDBlev2p/iAg6 W+QmX38zTsUjlvapM8NAHyjS46muC2ysEN7BPixv5QjlkiZVB7pwJSms8bHVZ1QsRd5q 2MHK2qBDPGxs5jdqEqgFVvTtlVol2WRds9HeAMc3tMZzHFi8D6vTbbA7MuxyhQzSoNhU D8jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bRisGjD1; spf=pass (google.com: domain of mptcp+bounces-1862-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-1862-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id h5si16944449pfn.202.2021.09.06.02.41.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Sep 2021 02:41:32 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-1862-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bRisGjD1; spf=pass (google.com: domain of mptcp+bounces-1862-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-1862-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id A1D083E1042 for ; Mon, 6 Sep 2021 09:41:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DB2A02FAF; Mon, 6 Sep 2021 09:41:30 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AEBAB3FC1 for ; Mon, 6 Sep 2021 09:41:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630921288; 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; bh=Uz0teKYvVl8MQPi1nUSalB6FarhhgxQmn5UIoqEVeu4=; b=bRisGjD1gqqp17uBKku6M2+rXFeFFzdaGtabMKNAnUCgeHM8uVpXi15OWn7agZjgHPbZ+a YhYrdjw4QdfTIU93sF4BSNwzQzUk/ZJ/Ihu2FLWcshLWusXPRkBU1auplvnhifU/ip1PMn pBR2YCb/RNpQ4priRYtyBXeF5JFHU5U= 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-192-m4tf7kWuMJ-Ua-l7MmWmig-1; Mon, 06 Sep 2021 05:41:27 -0400 X-MC-Unique: m4tf7kWuMJ-Ua-l7MmWmig-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B9148100960E for ; Mon, 6 Sep 2021 09:41:26 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F34D68D79 for ; Mon, 6 Sep 2021 09:41:25 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next] Squash-to: "mptcp: stop relying on tcp_tx_skb_cache" Date: Mon, 6 Sep 2021 11:41:21 +0200 Message-Id: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A small cleanup for the tcp_tx_skb_cache removal: we don't need to check for skb in zero win probe (matttbe) Signed-off-by: Paolo Abeni --- 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 2a525c7ae920..8c34c6339454 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1336,7 +1336,7 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct= sock *ssk, if (copy =3D=3D 0) { u64 snd_una =3D READ_ONCE(msk->snd_una); =20 - if (skb || snd_una !=3D msk->snd_nxt) { + if (snd_una !=3D msk->snd_nxt) { tcp_remove_empty_skb(ssk, tcp_write_queue_tail(ssk)); return 0; } --=20 2.26.3