PERFORCE change 147625 for review

[Bjoern A. Zeeb]

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

Change 147625 by bz at bz_dumpster on 2008/08/17 01:30:58

	move V_ missing; down to V_k* && halt -p

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#8 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#9 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#6 edit

Differences ...

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

@@ -4588,7 +4588,7 @@
 	}
 	ip_fw_ctl_ptr = ipfw_ctl;
 	ip_fw_chk_ptr = ipfw_chk;
-	callout_reset(&ipfw_timeout, hz, ipfw_tick, NULL);	
+	callout_reset(&V_ipfw_timeout, hz, ipfw_tick, NULL);	
 	LIST_INIT(&layer3_chain.nat);
 	return (0);
 }
@@ -4600,7 +4600,7 @@
 
 	ip_fw_chk_ptr = NULL;
 	ip_fw_ctl_ptr = NULL;
-	callout_drain(&ipfw_timeout);
+	callout_drain(&V_ipfw_timeout);
 	IPFW_WLOCK(&layer3_chain);
 	flush_tables(&layer3_chain);
 	layer3_chain.reap = NULL;

==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#9 (text+ko) ====

@@ -2784,8 +2784,8 @@
 			first = MODULE_GLOBAL(MOD_INET, ipport_lowfirstauto);
 			last = MODULE_GLOBAL(MOD_INET, ipport_lowlastauto);
 		} else {
-			first = ipport_firstauto;
-			last = ipport_lastauto;
+			first = MODULE_GLOBAL(MOD_INET, ipport_firstauto);
+			last = MODULE_GLOBAL(MOD_INET, ipport_lastauto);
 		}
 		if (first > last) {
 			uint16_t temp;

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

@@ -621,7 +621,7 @@
 	if (V_ip6_forwarding || !V_ip6_accept_rtadv) {
 		nd6log((LOG_WARNING,
 		    "defrouter_select: called unexpectedly (forwarding=%d, "
-		    "accept_rtadv=%d)\n", ip6_forwarding, V_ip6_accept_rtadv));
+		    "accept_rtadv=%d)\n", V_ip6_forwarding, V_ip6_accept_rtadv));
 		splx(s);
 		return;
 	}