I was going to suggest not capitalising 'Fix', but apparently I am wrong about what our convention is there. See https://freebsdfoundation.org/wp-content/uploads/2020/11/Writing-Commit-Messages.pdf where Ed explicitly recommends "Capitalize the first letter of the subject", and I'm not going to argue with Ed.

• fix whitespace
• add a few more (some commented out) debug options

More comment fixes & remove unwanted changes in i386/MINIMAL

Fix RISC-V comment.

In D46871#1069247, @markj wrote:

This patch is against stable/14, not main

I very much want this (and for release media to start including a kernel.debug by default when possible, cc releng), but sys/conf/std.debug already exists on main. In particular, you've added a few extra _DEBUG options here which aren't in GENERIC. I think that's probably fine, but ideally we'd start by MFCing the commit which added std.debug.

I can't reproduce the build failure, but this is fine.

Completely remove pf_krule_ptr

I like this, but we should go all the way and remove the pf_krule_ptr entirely. It's strictly a kernel structure, so there's no reason to keep it:

In D46870#1068713, @thj wrote:

I am not sure if we as a community want to be this direct/aggressive. I worry that we have gone so long being accommodating that a warning like this is too much.

Interesting observations.

In D46683#1067412, @glebius wrote:

I see no good reason to ifdef pieces of enum. Makes sense to disable some code for NOINET or NOINET6 kernels, but what's the point in disabling a piece of declaration?

I'm seeing this test fail quite often (though not always) because it can't find the 4204 state. So things appear to be doing what we'd expect, but there's no state. I'm not sure why, because it looks like we only check max_src_conn a state actually exists, so we ought to see it in the state table too. Sometimes that's the case, but not always.

The pf bits are in D46809

Rename to ip_af_t
Split out the pf changes to a separate commit

Thanks for spotting (and fixing) this.

There's something else going on here. The original check was correct.

That seems sane to me.

This seems to include a move to sys/netpfil/common/pft_ping.py, but not the makefile changes that would require. I assume the move is not intended to be part of this patch?

In D46683#1066400, @bz wrote:

diff --git sys/sys/socket.h sys/sys/socket.h
index a1b220ce4bae..f773f970b779 100644
--- sys/sys/socket.h
+++ sys/sys/socket.h
@@ -216,12 +216,14 @@ struct accept_filter_arg {
 #define        AF_UNIX         1               /* standardized name for AF_LOCAL */
-#define        AF_INET         2               /* internetwork: UDP, TCP, etc. */
+typedef enum {
+       AF_INET         = 2,            /* internetwork: UDP, TCP, etc. */
+       AF_INET6        = 28,           /* IPv6 */
+} ip_version_t;
+

Otherwise if you wanted a real "IP Version Type" then you'd define IPV4 as 4 and IPV6 as 6 but that's not what you are actually after, so maybe the enum is misnamed and should really be ip_af_t (whether here or in in.h)? If you call it af_ip_t it also perfectly fits in the above context.