From nobody Tue Sep 24 21:43:45 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 4XCtfB1jfYz5W70H; Tue, 24 Sep 2024 21:43:46 +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 4XCtfB1402z49L5; Tue, 24 Sep 2024 21:43:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727214226; 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=geI6gIIkIoCkdRbHakT/9KgvZC0D4qhdFgA0cOn054w=; b=Ce+cDX5vAxDKjck7hpGDoN58QGpluEMWCNFbMoS8usvALoDrtsy8+subHKqa24IOmEEQLA POOUbrDZI7hJ7oVFbnB7WHzwMUnFQIdJPOwiUMtW80gpWzowEaULV/T5qQvrC4tSsMZB8j 7rvQ0FPxRAKZmwZXxecwvn99AJkuNxSvLRAo6aA1+ooDc+FyFGI2nMH+SSTtnjJ43CVqu2 75V+Nr8Ikp2PLJbjBrXUkDrGIf2RXq0j3jOSfQQ7Q4H6Xhdaa5NVt58u9ZKGiP9XSdY3kJ 7k1oIvIGFEm+j50G/W6itxyJ1WZzVKYnKo3BA7VC+6J864UkGPE29eWvy8TdCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727214226; a=rsa-sha256; cv=none; b=VFDz+mUVCY+xVqwe8hxOzunS5CE19AouJZ2Gknp1cU71htHodr6kRYoZ4pOHZbpVWDwne7 fX2fB4jPOX+n+9ilZCJ95gVbDU8Y7CQvKgC2/L8JbI+9ED+U2aFEdHwSNT5Mr04WpsXM5h WOs+Kq+QcxZqqDfS1Pzac1eOkmg9/ABbqi91FzqbOjmV+sZaZiV2fAlR0ltn+6bT5z3gQ9 Y6k143YhB/rmfosnKgwR76XrGs/gBNg2K5lnARHt7LOnYGXqz2iNoW3JQ/p8OR6Np0iMmx dLa/DzQxbsxN3e6MFqnopWzqQzxOxc2Q3Cj8KtP4tCcqSj5kxQH1RIAlhnwlkA== 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=1727214226; 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=geI6gIIkIoCkdRbHakT/9KgvZC0D4qhdFgA0cOn054w=; b=FKRSgZx4+Ukl4pTby+jN2fKlNgTbbZZN/44XSH5xqNwDT3sb7pRcwcBM8McUWBj6RimoO7 iv/wTWM1zYauRFL02qVT7MZQMoH590C3aTyt41Yi2cKSrF6AwK6qWrIsVxQ3k2RcsnUeSL mr9K9kFqe2q2PrZ3xp6vcTXX0DEpKQv8Smfe9f0r5ZypWQwN06uacRrNQFzMSkeeF4mMEM o0tuSsloxUB2G6Ks8ojKfgvePmDXBmZRrYge5iQS2OvaCQKgd53gUFfhR4DX/aj6zf6UA2 NgnQISYXS5saipBJKIV37yXIwcbn3Mr0q3+1tmdpg7GnYbEJ4N3D05ZBolEktA== 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 4XCtfB0gNGzm1m; Tue, 24 Sep 2024 21:43:46 +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 48OLhjSh053748; Tue, 24 Sep 2024 21:43:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48OLhj4f053745; Tue, 24 Sep 2024 21:43:45 GMT (envelope-from git) Date: Tue, 24 Sep 2024 21:43:45 GMT Message-Id: <202409242143.48OLhj4f053745@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: a00c3a94bf64 - main - tcp: remove remnants of 20+ year old disabled code from d912c694ee00 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a00c3a94bf6436f1c412cd8fe66ef224621dab11 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a00c3a94bf6436f1c412cd8fe66ef224621dab11 commit a00c3a94bf6436f1c412cd8fe66ef224621dab11 Author: Gleb Smirnoff AuthorDate: 2024-09-24 21:36:10 +0000 Commit: Gleb Smirnoff CommitDate: 2024-09-24 21:36:10 +0000 tcp: remove remnants of 20+ year old disabled code from d912c694ee00 Fixes: 90ad2dc28747a3a5036d68ccc87d2352459f5cb1 --- sys/netinet/tcp.h | 2 -- sys/netinet/tcp_output.c | 3 --- 2 files changed, 5 deletions(-) diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h index f789898e5785..794bfc62eca5 100644 --- a/sys/netinet/tcp.h +++ b/sys/netinet/tcp.h @@ -166,8 +166,6 @@ __tcp_set_flags(struct tcphdr *th, uint16_t flags) #define TCP_MAX_WINSHIFT 14 /* maximum window shift */ -#define TCP_MAXBURST 4 /* maximum segments in a burst */ - #define TCP_MAXHLEN (0xf<<2) /* max length of header in bytes */ #define TCP_MAXOLEN (TCP_MAXHLEN - sizeof(struct tcphdr)) /* max space left for options */ diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 080dabf3232f..fe1f15c26338 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -211,9 +211,6 @@ tcp_default_output(struct tcpcb *tp) struct tcp_log_buffer *lgb; unsigned int wanted_cookie = 0; unsigned int dont_sendalot = 0; -#if 0 - int maxburst = TCP_MAXBURST; -#endif #ifdef INET6 struct ip6_hdr *ip6 = NULL; const bool isipv6 = (inp->inp_vflag & INP_IPV6) != 0;