From nobody Sat Jan 06 19:44:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T6rP16mYgz572tY; Sat, 6 Jan 2024 19:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T6rP15ynYz42FZ; Sat, 6 Jan 2024 19:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704570245; 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=ahBFfPebpyMzYR/3lA1918mpMLgn5alXBofHOIvKS7Y=; b=HnsRvGXnSQD/bekQMDpHF6z5AwWaFGmVOdp1sf7HyJp85M0XxKlFSIMxfuVEvHKTZ1nT/d AusC/ONQew0PxDxRJxjJXh2teQDUeos0b6bv+yXdXnpLcjnl96HeiXbBE1wzsiwpma5Opy Z+j6K/JMLxT7d8zhFeLTylDkY2vVWRiJIYIjYxpM61j5rnEiRiUUGw7pZ7PO9yycidCfNl VPa7aXpgVOvzPkQ8yIO6nIQBEfswfrhFAT+HfcA6RtvKNhvSul6sFWUSN4gsBCQEWR6Knc XbMGQxWV/hZ5D9X4sU3JEA/pyCv0zFRVBvSduM0Bm9sWAQD2Cg6TPjw23My4LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704570245; 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=ahBFfPebpyMzYR/3lA1918mpMLgn5alXBofHOIvKS7Y=; b=vBneqkAxWh2hcOoWjcDdd9+Kb6p/5MruSqrFJLWlRudDr2HrAVw+ljr6Wk71IL4ABaJDM4 mpZOnNXiLW/UC8Q+My9EGKUZXWjPyilZ77R2bYt1Z+UGISgX9tKrMbAEmO9UO95o6jOvu2 zNzv64Na7WXC0Cq06TGOmjN/JLGtLVStkWZ16I7/kHtXU1pUaegLj97+GcZhHQO8ciCeeh IGeynpem7SvffdeLSsON5gAWj2rCQtfRp0CO9r7deUuWPAxOTR/LKy8YQz0gzIl7lsEEoT pu3Ob2Qw7caJ/e3EarWfbWu9ZdljzmDFQfN9njEyoPnulzs516OlAUhg2Rp7yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704570245; a=rsa-sha256; cv=none; b=bWvZAaEOQ0C+P4oRUG06izV20eFcfHUUryCX+n6TZQ0logJKgnyFdfIgW9140nHtGfvC5S dB4pKqVJJMLDVo44RUjeTnVwuRWGfeR4Z/dFy16TrLAgdulCIzPft3KsOcs1ERqD1DHgYU lxu/wvDTVZ5SPM1FBzeTGeJj2V9bhjH40QEypLeqbCMUlDvqSQ0LvinXSFV+temef3nV+/ UxwXA1vnL8yjySbVTSDjINgBlyirpx3Q5H7HLGH/+p9+U4oaw/tXR/+/x3JeJY5sOVtoMY CwyVLEOWw9usgs90hl4K4ga5GIs9x4C6RoVq2JNpf8rE7ZsFsH542qD365ueoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T6rP152gDzty4; Sat, 6 Jan 2024 19:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 406Ji5w2098390; Sat, 6 Jan 2024 19:44:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 406Ji5aE098387; Sat, 6 Jan 2024 19:44:05 GMT (envelope-from git) Date: Sat, 6 Jan 2024 19:44:05 GMT Message-Id: <202401061944.406Ji5aE098387@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 893ed42eca32 - main - tcp: Make use of enum for sack_changed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 893ed42eca32f7b5e3a5b8cef3f364be0d9cf3ef Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=893ed42eca32f7b5e3a5b8cef3f364be0d9cf3ef commit 893ed42eca32f7b5e3a5b8cef3f364be0d9cf3ef Author: Richard Scheffenegger AuthorDate: 2024-01-06 19:07:39 +0000 Commit: Richard Scheffenegger CommitDate: 2024-01-06 19:23:52 +0000 tcp: Make use of enum for sack_changed No functional change. Reviewed By: tuexen, #transport MFC after: 3 days Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43346 --- sys/netinet/tcp_input.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index ab8fc4b4a3e4..1d6430f6ef20 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -2499,7 +2499,8 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, goto dropafterack; } if (tcp_is_sack_recovery(tp, &to)) { - if (((sack_changed = tcp_sack_doack(tp, &to, th->th_ack)) != 0) && + sack_changed = tcp_sack_doack(tp, &to, th->th_ack); + if ((sack_changed != SACK_NOCHANGE) && (tp->t_flags & TF_LRD)) { tcp_sack_lost_retransmission(tp, th); }