From nobody Mon Apr 24 23:29:07 2023 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 4Q51YH6Pf1z461cw; Mon, 24 Apr 2023 23:29:07 +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 4Q51YH5xYyz4528; Mon, 24 Apr 2023 23:29:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682378947; 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=IoKy1mFgqLv+zVhhuz6vpyhIqbn8mI3p0Hl6KUWVL3k=; b=FLU5wk+BV3kDlKfgoPH7H4kKyPtAwuOEtpgvIxMK8IQSfTMrOHMuBr4E7XzkkK5Qi7OlCe tYYcr5vCUIBGiisVCOMKh5tj4Na7YjQuE3dig8YdAGXCzDyHBxZAhJ/wfsoD15RtWjnZLG 04QW8MqC1LZTZwHn+RQjO3ETlTjLzWGTQmCU4OMWFaviC1xCzwOlvrs6seCv8WktT1P4k7 VN56hqos4OBLlXM3X+w84kCKoJaPTy1B+99PFVO0zdH5jYzQ/FSRJc4KWhRzNm3Dpr6Uua hha544gi2M8f0yrvWY5AbYplMuVppWcHQ/4O6mN1+DR0uLLp2sOlYt3He1Aegg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682378947; 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=IoKy1mFgqLv+zVhhuz6vpyhIqbn8mI3p0Hl6KUWVL3k=; b=Ybgtod9qIYnu3TZOkIUAHZuOqqumPTKXmMF1oYfJeJvUIBB8iZ+IS17m1yccy3sA/qoZEA 0n6GTNHix78Y2NqdQeGsVrs6qFCMpvWOeOCSejFuIjYUFyJkJdf2DpYJbKBHqM590mCKHd LtW+Ya5NWM8RRehSyYlOkCsIBQUmb9CaAS2q0BxqlCU+JDASM4fVkILejvGDDsE37Fuy8d f0FuYJ0+i91SoeKcZN4oqcrAj0cEhCFpEwPHOmkdI/n2vzs0NAbey4I3CIaqVlpsLx5ufK P9jzvTDHVfkyKlJhwaQJ/MpsMJ/SiFkzbp3h2QgccpGBHN7Qje6JMxnrkJ9u7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682378947; a=rsa-sha256; cv=none; b=Uzgykb1YDRg3pKNgFOMNdAIuq0g8jR8sC/mIHIP+x1jWlqd/reL9pBXYZT12bZL8R9Ecmb rPd5B85UTB4EUOmQcm7en7PG8qJE3uKnqKsP5TbpNWqdkytVZlt1G32LE+FKIFKDiWvqRh 3liGaqMuEeQ8no5JJGauoEJKHFCzBOWu6VMfJ8O4s6uagzFIWFrAT/xgKvuRNrkz1OOKsD OSNVQ8oLKUjVPl48FhYpV2qPMSSKDo9GbCfhrUh8TeqGmKxKq0pKB3aBAbYmZyj0mZCzq2 hu/EItWN5zwKYEiWNY+lQn49SK0jNxRJKCAcQ1BLfGElRkZpPSKR97+xBXrkPw== 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 4Q51YH4zgTzky2; Mon, 24 Apr 2023 23:29:07 +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 33ONT7aL042042; Mon, 24 Apr 2023 23:29:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ONT7oj042041; Mon, 24 Apr 2023 23:29:07 GMT (envelope-from git) Date: Mon, 24 Apr 2023 23:29:07 GMT Message-Id: <202304242329.33ONT7oj042041@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cheng Cui Subject: git: 8aa2be695e0c - main - Correct the value of macro TF2_TCP_ACCOUNTING. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8aa2be695e0c1e48ffef0de57b3b3dbee18486d8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=8aa2be695e0c1e48ffef0de57b3b3dbee18486d8 commit 8aa2be695e0c1e48ffef0de57b3b3dbee18486d8 Author: Cheng Cui AuthorDate: 2023-04-20 07:43:47 +0000 Commit: Cheng Cui CommitDate: 2023-04-24 19:28:41 +0000 Correct the value of macro TF2_TCP_ACCOUNTING. Summary: Make sure the values are in order. Reviewers: rscheff, tuexen, #transport! Approved by: rscheff, tuexen, glebius Subscribers: imp, melifaro, glebius Differential Revision: https://reviews.freebsd.org/D39716 --- sys/netinet/tcp_var.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 5632e5d8bb41..f80e9fc37ff4 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -834,7 +834,7 @@ tcp_packets_this_ack(struct tcpcb *tp, tcp_seq ack) #define TF2_ACE_PERMIT 0x00000100 /* Accurate ECN mode */ #define TF2_FBYTES_COMPLETE 0x00000400 /* We have first bytes in and out */ #define TF2_ECN_USE_ECT1 0x00000800 /* Use ECT(1) marking on session */ -#define TF2_TCP_ACCOUNTING 0x00010000 /* Do TCP accounting */ +#define TF2_TCP_ACCOUNTING 0x00001000 /* Do TCP accounting */ /* * Structure to hold TCP options that are only used during segment