From nobody Tue Jan 23 21:17:11 2024 X-Original-To: dev-commits-src-main@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 4TKKfb32Cqz589FW; Tue, 23 Jan 2024 21:17:11 +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 4TKKfb2Vw8z4jDs; Tue, 23 Jan 2024 21:17:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706044631; 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=GRSvcBcB4JQ+7B5whgomumyiCmSBZbuFmtic13Fgo/o=; b=SmylYIBrWIJ8m105xamJoFoo2loZnEL4Dw/gr14wQSJBd6tBPHMsJ3/KAXaytxujEoGem8 T7/JVxPfVYun4ST/moqqsi+samQtCPrd4t0YSpTFz3jU9y9uIXyVRe1Ifl9lvfL/sco1c+ LtrsCTAhoAu3d+MN7LL3dy1oODa8wWwJsgPwIZYHgLfvFGBSYNs3d6XDMIw9f/GaYtDL1g 6HLvnlr3pjCKZ5YOrfQ+AC7/hWbvdRuAeh1vFZ1xkJ4tvcT94fV54Wu9vZK0t+2QLgNuoD oBT16mEMb7M+m8W+o7GYW0vTy6C6TrlzVj50y3FYdTB/OqFK2Xdf2RBvZI9sHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706044631; 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=GRSvcBcB4JQ+7B5whgomumyiCmSBZbuFmtic13Fgo/o=; b=oP5692cqfOwoTQhPtk2L/yhlUWGSm5V15YTLIbGJ1jcfxj2rtUJlUsWG+AL9dHyh2/3slc OfHvw1li+mYguMsIt93R5gYAvqURVq0bczhIA0VPEuxwy9HR7eZq3B28U+Uu1Xh0VhM29p Xq0PrJRJa11UDaIQ84cDDGc6cL7pjrq7MkZjcevYtx/mDefqLozwmralw3VSra8gCzhoI1 7YFl7/jzrqqpnc3iiKJDY9LGUBzw+v75ncFpzvIjfbydlAr1EhlCQNGKf38Ole6YSDGUNz DWUKlg3CGTVwwqPeJZFonU9dpRzp48+6d4syfUuv/dFfJ5yH6Jy/AJC/AzeSig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706044631; a=rsa-sha256; cv=none; b=GPBpTqLAH83eEgM6uQO5jw2F+OcrfdUBjgJAc/MTSQuvg3kEYE0fJSt0bWy1KRxULKoV6+ eLTrwI64BgnJZ9mgRix0Zw5vrlt9Qet+aVy8orVi8lz3C8rCcXJ82ywwbMvQgEfKBdLSkE MPJZ7y/RMunslmcqJ87zmA/LvOhXSBb+5JatN8ZkiDJQ7HgnanxFvgP5PGUTbTH9B0fTig 666FysszTFCHiioo/ni+0PD9KG5Np+zRFuqko7B/vGnDaOZVU201bu+NhtgvH9L7/3XsZK 1VvXAnCoWMGcN+e9+ZUlRALds4Imqtgqk46sDUx6NILzQHjex7zJyeDBubKYJg== 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 4TKKfb1Z2vzmqy; Tue, 23 Jan 2024 21:17:11 +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 40NLHBlK033902; Tue, 23 Jan 2024 21:17:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NLHBM3033899; Tue, 23 Jan 2024 21:17:11 GMT (envelope-from git) Date: Tue, 23 Jan 2024 21:17:11 GMT Message-Id: <202401232117.40NLHBM3033899@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 90ad2dc28747 - main - tcp: remove 20+ year old disabled code from d912c694ee00 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90ad2dc28747a3a5036d68ccc87d2352459f5cb1 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=90ad2dc28747a3a5036d68ccc87d2352459f5cb1 commit 90ad2dc28747a3a5036d68ccc87d2352459f5cb1 Author: Gleb Smirnoff AuthorDate: 2024-01-23 21:16:34 +0000 Commit: Gleb Smirnoff CommitDate: 2024-01-23 21:16:34 +0000 tcp: remove 20+ year old disabled code from d912c694ee00 --- sys/netinet/tcp_output.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 43ea6d4b453c..71a50d54d5ee 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1719,16 +1719,6 @@ timer: tp->t_flags &= ~(TF_ACKNOW | TF_DELACK); if (tcp_timer_active(tp, TT_DELACK)) tcp_timer_activate(tp, TT_DELACK, 0); -#if 0 - /* - * This completely breaks TCP if newreno is turned on. What happens - * is that if delayed-acks are turned on on the receiver, this code - * on the transmitter effectively destroys the TCP window, forcing - * it to four packets (1.5Kx4 = 6K window). - */ - if (sendalot && --maxburst) - goto again; -#endif if (sendalot) goto again; return (0);