MFP4: @176978-176982, 176984, 176990-176994, 177441

"Whitspace" churn after the VIMAGE/VNET whirls.

Remove the need for some "init" functions within the network
stack, like pim6_init(), icmp_init() or significantly shorten
others like ip6_init() and nd6_init(), using static initialization
again where possible and formerly missed.

Move (most) variables back to the place they used to be before the
container structs and VIMAGE_GLOABLS (before r185088) and try to
reduce the diff to stable/7 and earlier as good as possible,
to help out-of-tree consumers to update from 6.x or 7.x to 8 or 9.

This also removes some header file pollution for putatively
static global variables.

Revert VIMAGE specific changes in ipfilter::ip_auth.c, that are
no longer needed.

Reviewed by:	jhb
Discussed with:	rwatson
Sponsored by:	The FreeBSD Foundation
Sponsored by:	CK Software GmbH
MFC after:	6 days

1 files changed, 22 insertions, 22 deletions

diff --git a/sys/netipsec/ipsec.h b/sys/netipsec/ipsec.h
index 92539b9..090255a 100644
--- a/sys/netipsec/ipsec.h
+++ b/sys/netipsec/ipsec.h
@@ -334,39 +334,39 @@ struct ipsec_history {
 
 VNET_DECLARE(int, ipsec_debug);
 #define	V_ipsec_debug		VNET(ipsec_debug)
+
+#ifdef REGRESSION
+VNET_DECLARE(int, ipsec_replay);
+VNET_DECLARE(int, ipsec_integrity);
+
+#define	V_ipsec_replay		VNET(ipsec_replay)
+#define	V_ipsec_integrity	VNET(ipsec_integrity)
+#endif
+
 VNET_DECLARE(struct ipsecstat, ipsec4stat);
-#define	V_ipsec4stat		VNET(ipsec4stat)
+VNET_DECLARE(struct secpolicy, ip4_def_policy);
+VNET_DECLARE(int, ip4_esp_trans_deflev);
+VNET_DECLARE(int, ip4_esp_net_deflev);
+VNET_DECLARE(int, ip4_ah_trans_deflev);
+VNET_DECLARE(int, ip4_ah_net_deflev);
 VNET_DECLARE(int, ip4_ah_offsetmask);
-#define	V_ip4_ah_offsetmask	VNET(ip4_ah_offsetmask)
 VNET_DECLARE(int, ip4_ipsec_dfbit);
-#define	V_ip4_ipsec_dfbit	VNET(ip4_ipsec_dfbit)
-VNET_DECLARE(int, ip4_esp_trans_deflev);
+VNET_DECLARE(int, ip4_ipsec_ecn);
+VNET_DECLARE(int, ip4_esp_randpad);
+VNET_DECLARE(int, crypto_support);
+
+#define	V_ipsec4stat		VNET(ipsec4stat)
+#define	V_ip4_def_policy	VNET(ip4_def_policy)
 #define	V_ip4_esp_trans_deflev	VNET(ip4_esp_trans_deflev)
-VNET_DECLARE(int, ip4_esp_net_deflev);
 #define	V_ip4_esp_net_deflev	VNET(ip4_esp_net_deflev)
-VNET_DECLARE(int, ip4_ah_trans_deflev);
 #define	V_ip4_ah_trans_deflev	VNET(ip4_ah_trans_deflev)
-VNET_DECLARE(int, ip4_ah_net_deflev);
 #define	V_ip4_ah_net_deflev	VNET(ip4_ah_net_deflev)
-VNET_DECLARE(struct secpolicy, ip4_def_policy);
-#define	V_ip4_def_policy	VNET(ip4_def_policy)
-VNET_DECLARE(int, ip4_ipsec_ecn);
+#define	V_ip4_ah_offsetmask	VNET(ip4_ah_offsetmask)
+#define	V_ip4_ipsec_dfbit	VNET(ip4_ipsec_dfbit)
 #define	V_ip4_ipsec_ecn		VNET(ip4_ipsec_ecn)
-VNET_DECLARE(int, ip4_esp_randpad);
 #define	V_ip4_esp_randpad	VNET(ip4_esp_randpad)
-
-VNET_DECLARE(int, crypto_support);
 #define	V_crypto_support	VNET(crypto_support)
 
-extern int ip4_ah_cleartos;
-
-#ifdef REGRESSION
-VNET_DECLARE(int, ipsec_replay);
-#define	V_ipsec_replay		VNET(ipsec_replay)
-VNET_DECLARE(int, ipsec_integrity);
-#define	V_ipsec_integrity	VNET(ipsec_integrity)
-#endif
-
 #define ipseclog(x)	do { if (V_ipsec_debug) log x; } while (0)
 /* for openbsd compatibility */
 #define	DPRINTF(x)	do { if (V_ipsec_debug) printf x; } while (0)