git: 674b96f58b9c - main - netstat: Add missing "shutdown-ack-timer" key to libxo output

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=674b96f58b9c7daabb53ba3180afe4fc26354e27

commit 674b96f58b9c7daabb53ba3180afe4fc26354e27
Author:     Bram <bram@cbbg.nl>
AuthorDate: 2024-07-23 09:05:13 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-20 15:06:50 +0000

    netstat: Add missing "shutdown-ack-timer" key to libxo output
    
    The key "shutdown-timer" was present twice in the libxo output. The second
    occurence of "shutdown-time" has been renamed to "shutdown-ack-timer".
    
    PR: 254672
    Reviewed by: imp, zlei
    Pull Request: https://github.com/freebsd/freebsd-src/pull/1331
---
 usr.bin/netstat/if.c   | 4 ++--
 usr.bin/netstat/sctp.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index f0af785bce04..877c7aa8dd5e 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -501,7 +501,7 @@ intpr(void (*pfunc)(char *), int af)
 		    IFA_STAT(ipackets), link|network, 1);
 		show_stat("lu", nerr_len, "received-errors", IFA_STAT(ierrors),
 		    link, 1);
-		/* Below is kept for backwards compatibility. Will be removed in the future. */
+		/* Below is kept for backwards compatibility. Will be removed before FreeBSD 16. */
 		show_stat("lu", nerr_len, "dropped-packets", IFA_STAT(iqdrops),
 		    link, 1);
 		show_stat("lu", nerr_len, "dropped-packets-in", IFA_STAT(iqdrops),
@@ -708,7 +708,7 @@ loop:
 	    new->ift_ip - old->ift_ip, 1, 1);
 	show_stat("lu", 5, "received-errors",
 	    new->ift_ie - old->ift_ie, 1, 1);
-	/* Below is kept for backwards compatibility. Will be removed in the future. */
+	/* Below is kept for backwards compatibility. Will be removed before FreeBSD 16. */
 	show_stat("lu", 5, "dropped-packets",
 	    new->ift_id - old->ift_id, 1, 1);
 	show_stat("lu", 5, "dropped-packets-in",
diff --git a/usr.bin/netstat/sctp.c b/usr.bin/netstat/sctp.c
index 92c4bf67b2fa..e9fd494e292b 100644
--- a/usr.bin/netstat/sctp.c
+++ b/usr.bin/netstat/sctp.c
@@ -711,7 +711,7 @@ sctp_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 	    "secret\n");
 	p(sctps_timopathmtu, "\t\t{:pmtu-timer/%ju} "
 	    "{N:/PMTU timer%s fired}\n");
-	p(sctps_timoshutdownack, "\t\t{:shutdown-timer/%ju} "
+	p(sctps_timoshutdownack, "\t\t{:shutdown-ack-timer/%ju} "
 	    "{N:/shutdown ack timer%s fired}\n");
 	p(sctps_timoshutdownguard, "\t\t{:shutdown-guard-timer/%ju} "
 	    "{N:/shutdown guard timer%s fired}\n");