From nobody Tue Feb 21 17:33:26 2023 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 4PLmbW5wGrz3swq0; Tue, 21 Feb 2023 17:33:27 +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 4PLmbW0H5Wz3kR4; Tue, 21 Feb 2023 17:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677000807; 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=CNxvErzCHS4vhTsf992qP8aapgBpsB6tOHD5f2vUHcg=; b=Dq+PZd8vpJVAaxATKyth/37Osi7/pUTa23l042J3g5FRi8SXBkmUP8OIF6fmZCl2YjoEH4 4GsjkLTna0/cetL5narsl9TDgQKlogNiP42ANUL4GwZxlCMy9XjVLZKqcDGQ3zP46Mg9bV ty4hEg/UO91IiydzXwQ1HzoyJKgYtZrvXAoQSHxfMCCx3XnSYeoSSS0malM/W7cbzCADNB /l2HgXoteQJGnZlCSXZ1tFFTWXyHKHF3Nai+Rs7OvOyOUojBYIsmXZZHv0XnXbWdFR7fBA iUA6vB/prrSOka8F91QT3b0ci8XzMaLUULTjrIeaoThxuhgBI6q2Wvg1cCAjyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677000807; 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=CNxvErzCHS4vhTsf992qP8aapgBpsB6tOHD5f2vUHcg=; b=d94KfTg4OoGk03iVJWeoUPDxsrOpTkX6R/kWwUt9lPehpt+k33Oa2QGJ94PMM1SW/ERQK5 qcpQJb9IXL5tnbggL6T/ocJtKZx7NxSskhwrfRdHXtn0NuUmndcPqAx0R0nDu3M73RsYLd Y2JAEEdWs3lcx3BWx/nBI7nyVEX9/Vu+WggqkNPZyIiUKit/+GasstjkuV0lsvC+MP9srC 5+u3SsFJ45qQrvu68cJzXwrrRQEYm/237x4XriMT5gCqYN1lr2pDOwnaEvs+vsof9Ovu+w GA7o+5FSc4OhOYNiBY295Dpt9PUiqgCiqGsMTQ51U+0vRq8chwRqAgmoeSa2Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677000807; a=rsa-sha256; cv=none; b=qp7REvIFnQfyNUL9i+l5vAUDPYHVCIPe7vqxMgkwD2BsZOatGQ+FvHUCaK3hSOg6FQcgkn oW5YhABGQUJ0/H1Pmwm6cwsf9ryGEPrdn27jwaQVErEgFYyaSuRNqDfER+iX41JEdBcAmE /6Z5wW2WOfNghye8ubbZvySw8ETPfXFzGc+fLk5A+G1MZTV3rHfLu+s/v0GvOeGmyB7DPz 7Fmc4zx+pDaaM7QxZQhkTbbG7tYLcStrbL5+Bhe9biyoXanWqwmcyFHJMjx5VQrA9O/r7c FuVt+5ei3wORA4AW9SHBOOnPZrqfeAGs7r7ub92Do2APSdsrh/f6FNxAQlz/sA== 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 4PLmbV6TMNzTPw; Tue, 21 Feb 2023 17:33:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31LHXQa8022762; Tue, 21 Feb 2023 17:33:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31LHXQCi022761; Tue, 21 Feb 2023 17:33:26 GMT (envelope-from git) Date: Tue, 21 Feb 2023 17:33:26 GMT Message-Id: <202302211733.31LHXQCi022761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 6b802933f16f - main - tcp: rearrange enum and remove unused variable 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b802933f16f7dba62800ef29912f378e048f2ce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6b802933f16f7dba62800ef29912f378e048f2ce commit 6b802933f16f7dba62800ef29912f378e048f2ce Author: Michael Tuexen AuthorDate: 2023-02-21 17:26:49 +0000 Commit: Michael Tuexen CommitDate: 2023-02-21 17:26:49 +0000 tcp: rearrange enum and remove unused variable Rearrange the enum tt_which such that TT_REXMIT is 0. This allows an extension of the BBLog event RTO in a backwards compatible way. Remove tcptimers, which was only used in trpt, a utility removed from the source tree recently. Reviewed by: glebius@, guest-ccui@ Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D38547 --- sys/netinet/tcp_timer.h | 5 ----- sys/netinet/tcp_var.h | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h index 9d27c9e3780e..9ee1d5fcdc91 100644 --- a/sys/netinet/tcp_timer.h +++ b/sys/netinet/tcp_timer.h @@ -127,11 +127,6 @@ */ #define TCP_RTT_INVALIDATE (TCP_MAXRXTSHIFT / 4) -#ifdef TCPTIMERS -static const char *tcptimers[] = - { "REXMT", "PERSIST", "KEEP", "2MSL", "DELACK" }; -#endif - /* * Force a time value to be in a certain range. */ diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index c2d5c2c99587..cd457893e36f 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -127,11 +127,11 @@ struct sackhint { STAILQ_HEAD(tcp_log_stailq, tcp_log_mem); typedef enum { - TT_DELACK = 0, - TT_REXMT, + TT_REXMT = 0, TT_PERSIST, TT_KEEP, TT_2MSL, + TT_DELACK, TT_N, } tt_which;