PERFORCE change 177977 for review

[Gabor Pali]

http://p4web.freebsd.org/@@177977?ac=10

Change 177977 by pgj at csupor on 2010/05/08 22:54:06

	Fix build of kernel.

Affected files ...

.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/icmp6.c#6 edit
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/ip6_mroute.c#8 edit
.. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/ipsec.c#8 edit
.. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/keysock.c#5 edit
.. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_ah.c#5 edit
.. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_esp.c#6 edit
.. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_ipcomp.c#6 edit
.. //depot/projects/soc2009/pgj_libstat/src/sys/netipx/ipx_input.c#4 edit
.. //depot/projects/soc2009/pgj_libstat/src/sys/netipx/spx_usrreq.c#5 edit

Differences ...

==== //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/icmp6.c#6 (text+ko) ====

@@ -90,6 +90,7 @@
 #include <net/if_types.h>
 #include <net/route.h>
 #include <net/vnet.h>
+#include <net/stat.h>
 
 #include <netinet/in.h>
 #include <netinet/in_pcb.h>

==== //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/ip6_mroute.c#8 (text+ko) ====

@@ -109,6 +109,7 @@
 #include <net/if_types.h>
 #include <net/raw_cb.h>
 #include <net/vnet.h>
+#include <net/stat.h>
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>

==== //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/ipsec.c#8 (text+ko) ====

@@ -118,13 +118,11 @@
 VNET_DEFINE(int, ip4_ipsec_ecn) = 0;
 VNET_DEFINE(int, ip4_esp_randpad) = -1;
 
-struct stat_header ipsecstat_header = {
+VNET_DEFINE(struct stat_header, ipsecstat_header) = {
 	.sth_version = IPSECSTAT_VERSION,
 	.sth_len = sizeof(struct ipsecstat)
 };
 
-VNET_DEFINE(struct stat_header, ipsecstat_header);
-
 /*
  * Crypto support requirements:
  *

==== //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/keysock.c#5 (text+ko) ====

@@ -75,13 +75,11 @@
 static VNET_DEFINE(struct key_cb, key_cb);
 #define	V_key_cb		VNET(key_cb)
 
-struct stat_header  pfkeystat_header = {
+VNET_DEFINE(struct stat_header, pfkeystat_header) = {
 	.sth_version = PFKEYSTAT_VERSION,
 	.sth_len = sizeof(struct pfkeystat)
 };
 
-VNET_DEFINE(struct stat_header, pfkeystat_header);
-
 static struct sockaddr key_src = { 2, PF_KEY, };
 
 static int key_sendup0 __P((struct rawcb *, struct mbuf *, int));

==== //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_ah.c#5 (text+ko) ====

@@ -94,13 +94,11 @@
 VNET_DEFINE(int, ah_cleartos) = 1;	/* clear ip_tos when doing AH calc */
 VNET_DEFINE(struct ahstat, ahstat);
 
-struct	stat_header ahstat_header = {
+VNET_DEFINE(struct stat_header, ahstat_header) = {
 	.sth_version = AHSTAT_VERSION,
 	.sth_len = sizeof(struct ahstat)
 };
 
-VNET_DEFINE(struct stat_header, ahstat_header);
-
 SYSCTL_DECL(_net_inet_ah);
 SYSCTL_VNET_INT(_net_inet_ah, OID_AUTO,
 	ah_enable,	CTLFLAG_RW,	&VNET_NAME(ah_enable),	0, "");

==== //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_esp.c#6 (text+ko) ====

@@ -81,13 +81,11 @@
 VNET_DEFINE(int, esp_enable) = 1;
 VNET_DEFINE(struct espstat, espstat);
 
-struct	stat_header espstat_header = {
+VNET_DEFINE(struct stat_header, espstat_header) = {
 	.sth_version = ESPSTAT_VERSION,
 	.sth_len = sizeof(struct espstat)
 };
 
-VNET_DEFINE(struct stat_header, espstat_header);
-
 SYSCTL_DECL(_net_inet_esp);
 SYSCTL_VNET_INT(_net_inet_esp, OID_AUTO,
 	esp_enable,	CTLFLAG_RW,	&VNET_NAME(esp_enable),	0, "");

==== //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_ipcomp.c#6 (text+ko) ====

@@ -47,10 +47,10 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
-#include <netinet/tcp_var.h>
 
 #include <net/route.h>
 #include <net/vnet.h>
+#include <net/stat.h>
 
 #include <netipsec/ipsec.h>
 #include <netipsec/xform.h>
@@ -73,13 +73,11 @@
 VNET_DEFINE(int, ipcomp_enable) = 1;
 VNET_DEFINE(struct ipcompstat, ipcompstat);
 
-struct	stat_header ipcompstat_header = {
+VNET_DEFINE(struct stat_header, ipcompstat_header) = {
 	.sth_version = IPCOMPSTAT_VERSION,
 	.sth_len = sizeof(struct ipcompstat)
 };
 
-VNET_DEFINE(struct stat_header, ipcompstat_header);
-
 SYSCTL_DECL(_net_inet_ipcomp);
 
 SYSCTL_VNET_INT(_net_inet_ipcomp, OID_AUTO,
@@ -628,8 +626,6 @@
 static void
 vnet_ipcomp_attach(const void *unused __unused)
 {
-
-	V_ipcompstat_header.sth_version = IPCOMPSTAT_VERSION;
 }
 
 VNET_SYSINIT(vnet_ipcomp_xform_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_MIDDLE,

==== //depot/projects/soc2009/pgj_libstat/src/sys/netipx/ipx_input.c#4 (text+ko) ====

@@ -80,8 +80,7 @@
 #include <net/if.h>
 #include <net/route.h>
 #include <net/netisr.h>
-
-#include <netinet/tcp_var.h>
+#include <net/stat.h>
 
 #include <netipx/ipx.h>
 #include <netipx/spx.h>

==== //depot/projects/soc2009/pgj_libstat/src/sys/netipx/spx_usrreq.c#5 (text+ko) ====

@@ -83,8 +83,9 @@
 #include <sys/sockopt.h>
 
 #include <net/route.h>
+#include <net/stat.h>
+
 #include <netinet/tcp_fsm.h>
-#include <netinet/tcp_var.h>
 
 #include <netipx/ipx.h>
 #include <netipx/ipx_pcb.h>