From nobody Tue Aug 13 17:02:33 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 4WjyP62ll1z5T3xV; Tue, 13 Aug 2024 17:02:34 +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 4WjyP5644xz4TZf; Tue, 13 Aug 2024 17:02:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723568553; 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=qW2YzQXfN2qbHi6TXS31naxh4VvRdVCDVV8FsWeD2kA=; b=TlNYIHX2wGQ05m3jxQB9mugK3EdJmeSH8Jq8hm88LoxKUzNxqPF+9jHqUbcK0vshTkbpA/ dglYKZ0ewAKGi2VG3qWxoYadu83hKj6AcSle3j0Cm6zNKs8w6HTfcvlZbb8/cx/V40Eb55 OhsWnBWX2B7UsgXO051U8uvUrqOE4hKCe1/VrMjyESrTfGUPt8dFbjP91H4X2HOpETqkbn 0X3FVZ97Jvkv3QoLdt7ws7OEQO4n/4CBaWx765X6gpqt2mhzV+E+DD70oLY14PQONFV9Gu mgWBKQenOYW1BjBoxMOWlMLe96/Rpv3GBZRiNmbhMep0FW5a78gFSq5axpDgUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723568553; a=rsa-sha256; cv=none; b=FrRDOhh3NPcVNDMNuj9rxxvugn1xWoRVWNGilGOO9vrmJKotm9RoGbKGOlc2KofyZg5hjQ 3jQhYS3qLbmuW2Ji8EzVoHStJZZjI3FrbuId7XA7fSCPy22GbH52jgh8VuF71CztLXZMdy Ph6CBtFjrxnqi5cc4EbPpVJQpWv5ZxQGJBFdsNbW88eAeejKw24oVs4bahGgSVnrQjspT2 81k3myfilKEAu6zTwxAgGeIlkunxJIRT+qZfFPeMGG/FdwHa2q4iPGpkm5gG5sIuTAa3vV 1u7orMibk76AuRlevMEntPQaeQwX3sBAnI64ysPb0nPr+xCQmELw1nXySCP85w== 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=1723568553; 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=qW2YzQXfN2qbHi6TXS31naxh4VvRdVCDVV8FsWeD2kA=; b=IVfNF+2TdicsxWjJz9yo9EXCBqyOlB4KUdA8YpAX7nchaEvwLU6ymRmVQx84r0RhNMpdbB KFz3EXhhcY/IcqpBJEGl+UBgRk9oFJXq7+ZD2KRa1VEWWsrjqjPYCBd5/mRPh12MpHLZ+5 ocU++RKEDf6e2/nsAljfLBenXqr4qkFAd4VgGug2uhs4r0VbO66zF8tMrmmc5yWuV+72Do iOVGy73OgPZgVKAcWLsWKRKaqEQz3RQUezPh9IpJhlnRnlbRV+zTyl2Moccxfu2ej7UVQ8 oblb5uUgf/3EiXLjdG/eT7Pb4gx8KvuBv3a62gAU/PN7MDkCyjoWaHnQ2/G0fQ== 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 4WjyP55dFyzJty; Tue, 13 Aug 2024 17:02:33 +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 47DH2Xtb002103; Tue, 13 Aug 2024 17:02:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47DH2XaU002100; Tue, 13 Aug 2024 17:02:33 GMT (envelope-from git) Date: Tue, 13 Aug 2024 17:02:33 GMT Message-Id: <202408131702.47DH2XaU002100@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: b97b3dead5dd - stable/14 - Revert "ddb: update printing of t_flags and tflags2" 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: b97b3dead5ddd9e4035e55680ad0f301688b8215 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b97b3dead5ddd9e4035e55680ad0f301688b8215 commit b97b3dead5ddd9e4035e55680ad0f301688b8215 Author: Michael Tuexen AuthorDate: 2024-08-13 17:02:20 +0000 Commit: Michael Tuexen CommitDate: 2024-08-13 17:02:20 +0000 Revert "ddb: update printing of t_flags and tflags2" This reverts commit d3c1df53f5bd73ee76f05e6f85c2766e54a4e454. --- sys/netinet/tcp_usrreq.c | 92 +++++------------------------------------------- 1 file changed, 8 insertions(+), 84 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index d93ef200b97d..384c27b3a6cd 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -2897,14 +2897,6 @@ db_print_tflags(u_int t_flags) db_printf("%sTF_PREVVALID", comma ? ", " : ""); comma = 1; } - if (t_flags & TF_WAKESOR) { - db_printf("%sTF_WAKESOR", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_GPUTINPROG) { - db_printf("%sTF_GPUTINPROG", comma ? ", " : ""); - comma = 1; - } if (t_flags & TF_MORETOCOME) { db_printf("%sTF_MORETOCOME", comma ? ", " : ""); comma = 1; @@ -2925,10 +2917,18 @@ db_print_tflags(u_int t_flags) db_printf("%sTF_FASTRECOVERY", comma ? ", " : ""); comma = 1; } + if (t_flags & TF_CONGRECOVERY) { + db_printf("%sTF_CONGRECOVERY", comma ? ", " : ""); + comma = 1; + } if (t_flags & TF_WASFRECOVERY) { db_printf("%sTF_WASFRECOVERY", comma ? ", " : ""); comma = 1; } + if (t_flags & TF_WASCRECOVERY) { + db_printf("%sTF_WASCRECOVERY", comma ? ", " : ""); + comma = 1; + } if (t_flags & TF_SIGNATURE) { db_printf("%sTF_SIGNATURE", comma ? ", " : ""); comma = 1; @@ -2941,30 +2941,6 @@ db_print_tflags(u_int t_flags) db_printf("%sTF_TSO", comma ? ", " : ""); comma = 1; } - if (t_flags & TF_TOE) { - db_printf("%sTF_TOE", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_CLOSED) { - db_printf("%sTF_CLOSED", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_SENTSYN) { - db_printf("%sTF_SENTSYN", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_LRD) { - db_printf("%sTF_LRD", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_CONGRECOVERY) { - db_printf("%sTF_CONGRECOVERY", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_WASCRECOVERY) { - db_printf("%sTF_WASCRECOVERY", comma ? ", " : ""); - comma = 1; - } if (t_flags & TF_FASTOPEN) { db_printf("%sTF_FASTOPEN", comma ? ", " : ""); comma = 1; @@ -3013,62 +2989,10 @@ db_print_tflags2(u_int t_flags2) db_printf("%sTF2_ACE_PERMIT", comma ? ", " : ""); comma = 1; } - if (t_flags2 & TF2_HPTS_CPU_SET) { - db_printf("%sTF2_HPTS_CPU_SET", comma ? ", " : ""); - comma = 1; - } if (t_flags2 & TF2_FBYTES_COMPLETE) { db_printf("%sTF2_FBYTES_COMPLETE", comma ? ", " : ""); comma = 1; } - if (t_flags2 & TF2_ECN_USE_ECT1) { - db_printf("%sTF2_ECN_USE_ECT1", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_TCP_ACCOUNTING) { - db_printf("%sTF2_TCP_ACCOUNTING", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_HPTS_CALLS) { - db_printf("%sTF2_HPTS_CALLS", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_MBUF_L_ACKS) { - db_printf("%sTF2_MBUF_L_ACKS", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_MBUF_ACKCMP) { - db_printf("%sTF2_MBUF_ACKCMP", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_SUPPORTS_MBUFQ) { - db_printf("%sTF2_SUPPORTS_MBUFQ", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_MBUF_QUEUE_READY) { - db_printf("%sTF2_MBUF_QUEUE_READY", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_DONT_SACK_QUEUE) { - db_printf("%sTF2_DONT_SACK_QUEUE", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_CANNOT_DO_ECN) { - db_printf("%sTF2_CANNOT_DO_ECN", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_PROC_SACK_PROHIBIT) { - db_printf("%sTF2_PROC_SACK_PROHIBIT", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_IPSEC_TSO) { - db_printf("%sTF2_IPSEC_TSO", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_NO_ISS_CHECK) { - db_printf("%sTF2_NO_ISS_CHECK", comma ? ", " : ""); - comma = 1; - } } static void