PERFORCE change 178377 for review

[Marko Zec]

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

Change 178377 by zec at zec_nxlab on 2010/05/17 10:16:19

	Do not call X_ip_mrouter_done() after FREE()ing V_nexpire,
	as this would lead to a crash.
	
	We must reference V_irtualized timers when attempting to 
	stop them in X_ip_mrouter_done() - did this code ever compile
	with VIMAGE defined?

Affected files ...

.. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#33 edit

Differences ...

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

@@ -752,9 +752,9 @@
 
     EVENTHANDLER_DEREGISTER(ifnet_departure_event, if_detach_event_tag);
 
-    callout_stop(&expire_upcalls_ch);
-    callout_stop(&bw_upcalls_ch);
-    callout_stop(&bw_meter_ch);
+    callout_stop(&V_expire_upcalls_ch);
+    callout_stop(&V_bw_upcalls_ch);
+    callout_stop(&V_bw_meter_ch);
 
     MFC_LOCK();
 
@@ -2826,14 +2826,9 @@
 static void
 vnet_mroute_uninit(const void *unused __unused)
 {
-    	/*
-	callout_stop(&V_expire_upcalls_ch);
-    	callout_stop(&V_bw_upcalls_ch);
-    	callout_stop(&V_bw_meter_ch);
-	*/
+
 	FREE(V_nexpire, M_MRTABLE);
 	V_nexpire = NULL;
-	X_ip_mrouter_done();
 }
 
 VNET_SYSUNINIT(vnet_mroute_uninit, SI_SUB_PSEUDO, SI_ORDER_MIDDLE,