PERFORCE change 153567 for review

[Marko Zec]

http://perforce.freebsd.org/chv.cgi?CH=153567

Change 153567 by zec at zec_tca51 on 2008/11/26 01:22:05

	Unbreak GENETRIC and VIMAGE kernel builds.

Affected files ...

.. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#55 edit
.. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#21 edit
.. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#40 edit
.. //depot/projects/vimage/src/sys/netinet/udp_var.h#9 edit
.. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#34 edit
.. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#40 edit
.. //depot/projects/vimage/src/sys/netinet6/ip6_var.h#16 edit
.. //depot/projects/vimage/src/sys/netinet6/nd6.c#37 edit
.. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#27 edit
.. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#23 edit
.. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#22 edit

Differences ...

==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#55 (text+ko) ====

@@ -1798,7 +1798,6 @@
 add_table_entry(struct ip_fw_chain *ch, uint16_t tbl, in_addr_t addr,
     uint8_t mlen, uint32_t value)
 {
-	INIT_VNET_IPFW(curvnet);
 	struct radix_node_head *rnh;
 	struct table_entry *ent;
 

==== //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#21 (text+ko) ====

@@ -150,8 +150,8 @@
     &maxtcptw, 0, sysctl_maxtcptw, "IU",
     "Maximum number of compressed TCP TIME_WAIT entries");
 
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, nolocaltimewait, CTLFLAG_RW,
-    &nolocaltimewait, 0,
+SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, nolocaltimewait,
+    CTLFLAG_RW, nolocaltimewait, 0,
     "Do not create compressed TCP TIME_WAIT entries for local connections");
 
 void

==== //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#40 (text+ko) ====

@@ -113,7 +113,8 @@
 SYSCTL_INT(_net_inet_udp, OID_AUTO, log_in_vain, CTLFLAG_RW,
     &udp_log_in_vain, 0, "Log all incoming UDP packets");
 
-SYSCTL_INT(_net_inet_udp, OID_AUTO, blackhole, CTLFLAG_RW, &udp_blackhole, 0,
+SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_udp, OID_AUTO, blackhole,
+    CTLFLAG_RW, udp_blackhole, 0,
     "Do not send port unreachables for refused connects");
 
 u_long	udp_sendspace = 9216;		/* really max datagram size */

==== //depot/projects/vimage/src/sys/netinet/udp_var.h#9 (text+ko) ====

@@ -99,10 +99,10 @@
 extern struct inpcbhead		udb;
 extern struct inpcbinfo		udbinfo;
 extern struct udpstat		udpstat;
+extern int			udp_blackhole;
 #endif
 extern u_long			udp_sendspace;
 extern u_long			udp_recvspace;
-extern int			udp_blackhole;
 extern int			udp_log_in_vain;
 
 void		 udp_ctlinput(int, struct sockaddr *, void *);

==== //depot/projects/vimage/src/sys/netinet6/in6_proto.c#34 (text+ko) ====


==== //depot/projects/vimage/src/sys/netinet6/ip6_input.c#40 (text+ko) ====


==== //depot/projects/vimage/src/sys/netinet6/ip6_var.h#16 (text+ko) ====

@@ -316,8 +316,8 @@
 extern int   ip6_lowportmin;		/* minimum reserved port */
 extern int   ip6_lowportmax;		/* maximum reserved port */
 
+#ifdef VIMAGE_GLOBALS
 extern int	ip6_use_tempaddr; /* whether to use temporary addresses. */
-#ifdef VIMAGE_GLOBALS
 extern int	ip6_prefer_tempaddr; /* whether to prefer temporary addresses
 					in the source address selection */
 #endif

==== //depot/projects/vimage/src/sys/netinet6/nd6.c#37 (text+ko) ====

@@ -50,6 +50,7 @@
 #include <sys/syslog.h>
 #include <sys/queue.h>
 #include <sys/sysctl.h>
+#include <sys/vimage.h>
 
 #include <net/if.h>
 #include <net/if_arc.h>
@@ -158,10 +159,10 @@
 	V_llinfo_nd6.ln_prev = &V_llinfo_nd6;
 	LIST_INIT(&V_nd_prefix);
 
-	ip6_use_tempaddr = 0;
-	ip6_temp_preferred_lifetime = DEF_TEMP_PREFERRED_LIFETIME;
-	ip6_temp_valid_lifetime = DEF_TEMP_VALID_LIFETIME;
-	ip6_temp_regen_advance = TEMPADDR_REGEN_ADVANCE;
+	V_ip6_use_tempaddr = 0;
+	V_ip6_temp_preferred_lifetime = DEF_TEMP_PREFERRED_LIFETIME;
+	V_ip6_temp_valid_lifetime = DEF_TEMP_VALID_LIFETIME;
+	V_ip6_temp_regen_advance = TEMPADDR_REGEN_ADVANCE;
 
 	V_ip6_desync_factor = 0;
 

==== //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#27 (text+ko) ====

@@ -1099,7 +1099,8 @@
 };
 
 #ifdef VIMAGE_GLOBALS
-static struct dadq_head dadq;
+static TAILQ_HEAD(, dadq) dadq;
+int dad_init;
 #endif
 
 static struct dadq *

==== //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#23 (text+ko) ====

@@ -95,8 +95,6 @@
 int ip6_desync_factor;
 u_int32_t ip6_temp_preferred_lifetime;
 u_int32_t ip6_temp_valid_lifetime;
-int ip6_temp_preferred_lifetime;
-static int ip6_temp_valid_lifetime;
 int ip6_temp_regen_advance;
 #endif
 

==== //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#22 (text+ko) ====

@@ -1411,7 +1411,7 @@
 	if (v3) {
 		tl = nfsm_build(u_int32_t *, NFSX_UNSIGNED);
 		if (fmode & O_EXCL) {
-			CURVNET_SET(VFSTONFS(dvp->v_mount)->nm_so->so_vnet);
+			CURVNET_SET(VFSTONFS(dvp->v_mount)->nm_rpcclnt.rc_so->so_vnet);
 			*tl = txdr_unsigned(NFSV3CREATE_EXCLUSIVE);
 			tl = nfsm_build(u_int32_t *, NFSX_V3CREATEVERF);
 #ifdef INET