From nobody Tue Jan 9 12:57:38 2024 X-Original-To: dev-commits-src-branches@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 4T8WDg1THnz57PMV; Tue, 9 Jan 2024 12:57:39 +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 4T8WDg10fPz4wrc; Tue, 9 Jan 2024 12:57:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704805059; 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=zVruVdWr85vIM9DYTyZ0X9ZSMaeHSGu8EkAnFS6OjQU=; b=WmmGHGeOpukFhctTC1oR0YvZwn4fC3EEacsYu0BuO9Rh/1ZPDRo1zn5p79Kha99Vkx8pTL 14Np0qjY7CH/nVTm2qYcXyrb8aPY8IZoAlV2ihWEUtRinf4rZ8c0r26yRcDpzExYbjfWyF Ywbw3x2K9qEIUaNgl+JfAKAVKRJIr9ncpe7NlFegj8HQfl1v8qHTG98n6A2HKdtEz1QXCn Mv8I71fhnsm3rooT4h2FueZ0G5ZIsxJ/m+FPLTiCkkpC/fTAUamBSIIlmbTdGXgRTvrOz4 E/FYVOWxM2EYy+nxe9czx/tsBh/r7kAmFjHbLwLsjE2hxxri8NhvvV3Df5pLDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704805059; 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=zVruVdWr85vIM9DYTyZ0X9ZSMaeHSGu8EkAnFS6OjQU=; b=gW67XxzXXs2Bs/2v5GVlBAniyCmKkH3UH0yX3bQC6MWKy9umC4TLLRlXXqv7hXvdTAiGfy qbxDefpP9RdbXMjyFJYa5CkxdjGjo5SQYYTw1F0xgsdumqtNTDnVJtaAHIheIyXCvtiNqG srF6Mx/3pd7SqXUle299Kpax3GIMLacZGclDP4GEzeewoar3gX22+BopXT6LIIhqj8K0Dy /9gLh0ct8TF/7kt792zKM1Nl5gzTplSZXcAvmVL21n/0O9AUDNVJJLTCNaPf3pRvq3ue7q YkXdU7CrxJsQ6blvseOJLx3qJcTQmnmvYyDOq8ee/1+MKHkGP5gHh+Fskka0lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704805059; a=rsa-sha256; cv=none; b=Hzu4mO9sw3KCBoijOZkV9m0779XwG7VOkBjbutUP5pfmxsZz1m13bqhyTeR+JDWtO2tvS3 4D92KxE7JrbXM/PI0TsR9EPXYwvSRUoiaFvsz8uTFAMOMeqwlYGlUrfx3RmeF5qT4ZJ+f0 a4g0imTNcPR3nTnJIbtwfnErmSmVflqfbMx0X/MLzm/2NMD2I6d10P+vBjQmpiFbSRDTg+ KvClRjHvTGwl1UiLazudMIq1Jr/fhjQHgazdU4u2uCGCm5y4I0wz4lWbROC8dPKgfbSkN3 wjtr7DIjTbCBsa0DBKPjjP7DudDct5VzFi8hUyYpz6Lvn1azS3nqcywSj0+/Dw== 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 4T8WDg03nXzrhY; Tue, 9 Jan 2024 12:57:39 +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 409Cvcb8075888; Tue, 9 Jan 2024 12:57:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 409Cvctt075885; Tue, 9 Jan 2024 12:57:38 GMT (envelope-from git) Date: Tue, 9 Jan 2024 12:57:38 GMT Message-Id: <202401091257.409Cvctt075885@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: 541d89067add - stable/14 - tcp: Make use of enum for sack_changed List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 541d89067addcc7fec96214225c82e43d2ce037e Auto-Submitted: auto-generated The branch stable/14 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=541d89067addcc7fec96214225c82e43d2ce037e commit 541d89067addcc7fec96214225c82e43d2ce037e Author: Richard Scheffenegger AuthorDate: 2024-01-06 19:07:39 +0000 Commit: Richard Scheffenegger CommitDate: 2024-01-09 12:54:48 +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 (cherry picked from commit 893ed42eca32f7b5e3a5b8cef3f364be0d9cf3ef) --- 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 512da877846a..2d7a6fa11b4e 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -2506,7 +2506,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); }