From owner-p4-projects@FreeBSD.ORG  Mon May 17 10:16:54 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 645631065674; Mon, 17 May 2010 10:16:54 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 27ED01065670
	for <perforce@freebsd.org>; Mon, 17 May 2010 10:16:54 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1625C8FC16
	for <perforce@freebsd.org>; Mon, 17 May 2010 10:16:54 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4HAGrhu098129
	for <perforce@freebsd.org>; Mon, 17 May 2010 10:16:53 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4HAGr5T098127
	for perforce@freebsd.org; Mon, 17 May 2010 10:16:53 GMT
	(envelope-from zec@fer.hr)
Date: Mon, 17 May 2010 10:16:53 GMT
Message-Id: <201005171016.o4HAGr5T098127@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 178377 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 May 2010 10:16:54 -0000

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

Change 178377 by zec@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,