From e4a8065910cd6b2e7e0448cc6431ca2906322389 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Thu, 9 Aug 2018 13:04:41 +0200
Subject: Update to FreeBSD head 2017-10-01

Git mirror commit b2f0376b45428f13151d229c5ae9d4d8f74acbd1.

Update #3472.
---
 freebsd/usr.bin/netstat/inet.c  | 14 +++++++++++++-
 freebsd/usr.bin/netstat/main.c  |  5 ++---
 freebsd/usr.bin/vmstat/vmstat.c |  1 +
 3 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'freebsd/usr.bin')

diff --git a/freebsd/usr.bin/netstat/inet.c b/freebsd/usr.bin/netstat/inet.c
index 05d5f2c3..1b1bb2cb 100644
--- a/freebsd/usr.bin/netstat/inet.c
+++ b/freebsd/usr.bin/netstat/inet.c
@@ -774,12 +774,24 @@ tcp_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 	    "{N:/time%s unexpected signature received}\n");
 	p(tcps_sig_err_nosigopt, "\t{:no-signature-provided/%ju} "
 	    "{N:/time%s no signature provided by segment}\n");
+
+	xo_close_container("tcp-signature");
+	xo_open_container("pmtud");
+
+	p(tcps_pmtud_blackhole_activated, "\t{:pmtud-activated/%ju} "
+	    "{N:/Path MTU discovery black hole detection activation%s}\n");
+	p(tcps_pmtud_blackhole_activated_min_mss,
+	    "\t{:pmtud-activated-min-mss/%ju} "
+	    "{N:/Path MTU discovery black hole detection min MSS activation%s}\n");
+	p(tcps_pmtud_blackhole_failed, "\t{:pmtud-failed/%ju} "
+	    "{N:/Path MTU discovery black hole detection failure%s}\n");
  #undef p
  #undef p1a
  #undef p2
  #undef p2a
  #undef p3
-	xo_close_container("tcp-signature");
+	xo_close_container("pmtud");
+
 
 	xo_open_container("TCP connection count by state");
 	xo_emit("{T:/TCP connection count by state}:\n");
diff --git a/freebsd/usr.bin/netstat/main.c b/freebsd/usr.bin/netstat/main.c
index 3cf39d1c..0e51ddc3 100644
--- a/freebsd/usr.bin/netstat/main.c
+++ b/freebsd/usr.bin/netstat/main.c
@@ -515,14 +515,13 @@ main(int argc, char *argv[])
 	if (!live) {
 		if (setgid(getgid()) != 0)
 			xo_err(-1, "setgid");
+		/* Load all necessary kvm symbols */
+		kresolve_list(nl);
 	}
 
 	if (xflag && Tflag)
 		xo_errx(1, "-x and -T are incompatible, pick one.");
 
-	/* Load all necessary kvm symbols */
-	kresolve_list(nl);
-
 	if (Bflag) {
 		if (!live)
 			usage();
diff --git a/freebsd/usr.bin/vmstat/vmstat.c b/freebsd/usr.bin/vmstat/vmstat.c
index 07e7decf..7c54ba8d 100644
--- a/freebsd/usr.bin/vmstat/vmstat.c
+++ b/freebsd/usr.bin/vmstat/vmstat.c
@@ -888,6 +888,7 @@ dovmstat(unsigned int interval, int reps)
 			xo_emit(" ");
 			xo_emit("{:free-memory/%7d}",
 			        vmstat_pgtok(total.t_free));
+			xo_emit(" ");
 		}
 		xo_emit("{:total-page-faults/%5lu} ",
 		        (unsigned long)rate(sum.v_vm_faults -
-- 
cgit v1.2.3