From nobody Sat Aug 03 23:10:51 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 4Wbz2h09XCz5RWpn; Sat, 03 Aug 2024 23:10:51 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wbz2g6VX9z4Q6K; Sat, 3 Aug 2024 23:10:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722726651; 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=FBWtKk//eSCPDNwiMJ4GhSlO94YeLsZJqwHvwOUi1kw=; b=ytR53pG/8/pLUoixtaWg5rF/7bgTJyFz1v8u69pmI51BcQDvfbLMM2Zo5ezqDdlzRL/XQG +yBrnWy5szWpUUPEdskKc6JGs9a8jr7VRc8oyfTn9RaNp2ieacCldaPYwTznFrQRmuVBw8 svttJhaqsjaI3GSwMtQSJy1v8TTVLoI1FBDhMd0NRHP+s24zfzx0Oa6c2EMFfTtw1xw3LE kflzZ/VX+dBRYsGQnSL4ajMka4PFdCsjp3032NOUc6qSH9qNqalq2ktolpUp/ZU5mK4j30 CNQGHTdw65MuQboZK4nCTmcX8daOvdAASRvHVJHnU01ajxrLtIG/AjFx1Z9gyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722726651; a=rsa-sha256; cv=none; b=NcuLOAZXhBENTMnkCmWzAnRe0jbKQdqJ9A1KOSzEbe7m/V9vDiiQku61xndX+71THq/XvA UGXp9OJuTRjSUPcsm+ZvJIPpAA0dudXIXCS2mNX6Q1WZqoiZeaWBEiUAovySbRJVpIKtA/ CeEIw0NF4nMkPu/KI5/YfGfptnC+pQJWXSZZKoVpAnQNcggc4gpdj6HKmLngmJtp48jJ/H i93XYS3f4YWwhi6N22IfLGAvSBQzYDHRntyMPX6SkTWOILkpkI927o+gau/uz20obuFs5R o+vzoeUdk1Cut8x7p9aeZUFMT4id0LV2hci2sx9FZBUM2r8S0xAMsid6wAHyBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722726651; 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=FBWtKk//eSCPDNwiMJ4GhSlO94YeLsZJqwHvwOUi1kw=; b=jNhQ7AbhV0INwz1P0KPjVzudOGQszTmkD9Ra2d98AKRBNDzgwf3kiOSLoudMnV400XqT8b iL/HMd/x5nWAeCXXVzKnPe2JLrnd9b8qUlrXxjIo9EOq8VQg2w6Aoc4AkjXjOn/zdSmxGf RKCcC2431xW2ONB/+L/9jav2sp+hPmKXGFkwKYFjjHGa/SqIO4vatYeyjKw85ZP7j72QNr fLlpQ4W1YSsorTvCYwXa6Ub4wcPfkm22PEST4Fcll+d2E8s+xYRgD7nwYegtzPSdmEW/68 K3yyFjWDqyjaJ773ubPo9XhPffsLNYI598BGyLv+zPzrBrLx06EyEkwrVuJQrg== 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 4Wbz2g5Hm7zW0F; Sat, 3 Aug 2024 23:10:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 473NApkA006903; Sat, 3 Aug 2024 23:10:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 473NApda006900; Sat, 3 Aug 2024 23:10:51 GMT (envelope-from git) Date: Sat, 3 Aug 2024 23:10:51 GMT Message-Id: <202408032310.473NApda006900@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: f0b0eefe581f - stable/14 - tcp: use TCP_MAXWIN instead of 65535 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f0b0eefe581f5b476d7692fa06334e4c658ef737 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f0b0eefe581f5b476d7692fa06334e4c658ef737 commit f0b0eefe581f5b476d7692fa06334e4c658ef737 Author: Michael Tuexen AuthorDate: 2024-07-22 06:52:12 +0000 Commit: Michael Tuexen CommitDate: 2024-08-03 23:10:28 +0000 tcp: use TCP_MAXWIN instead of 65535 This is suggested by cc@. No functional change. Sponsored by: Netflix, Inc. (cherry picked from commit 37b3e6a660f551ceda412e2115748f3b97b2e615) --- sys/netinet/tcp_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 21f4d046d6c9..cb72ddbef947 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -2422,7 +2422,7 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, /* * Ack processing. */ - if (SEQ_GEQ(tp->snd_una, tp->iss + (65535 << tp->snd_scale))) { + if (SEQ_GEQ(tp->snd_una, tp->iss + (TCP_MAXWIN << tp->snd_scale))) { /* Checking SEG.ACK against ISS is definitely redundant. */ tp->t_flags2 |= TF2_NO_ISS_CHECK; }