From owner-p4-projects@FreeBSD.ORG  Fri May 21 17:34:40 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2E9791065675; Fri, 21 May 2010 17:34:40 +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 E794E1065673
	for <perforce@freebsd.org>; Fri, 21 May 2010 17:34:39 +0000 (UTC)
	(envelope-from iprebeg@freebsd.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D55088FC13
	for <perforce@freebsd.org>; Fri, 21 May 2010 17:34:39 +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 o4LHYdLs067682
	for <perforce@freebsd.org>; Fri, 21 May 2010 17:34:39 GMT
	(envelope-from iprebeg@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4LHYd7N067680
	for perforce@freebsd.org; Fri, 21 May 2010 17:34:39 GMT
	(envelope-from iprebeg@freebsd.org)
Date: Fri, 21 May 2010 17:34:39 GMT
Message-Id: <201005211734.o4LHYd7N067680@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	iprebeg@freebsd.org using -f
From: Ivor Prebeg <iprebeg@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 178600 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: Fri, 21 May 2010 17:34:40 -0000

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

Change 178600 by iprebeg@iprebeg_zeus on 2010/05/21 17:34:32

	Removed X_ip_mrouter_done() from vnet_mroute_uninit() as it causes mtx_lock() on already destroyed mutex and all work is alreadly done anyway

Affected files ...

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

Differences ...

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

@@ -707,9 +707,7 @@
     struct ifnet *ifp;
     struct ifreq ifr;
 
-    printf ("V_mcast: before MROUTER LOCK\n");
     MROUTER_LOCK();
-    printf ("V_mcast: after MROUTER LOCK\n");
 
     if (V_ip_mrouter == NULL) {
 	MROUTER_UNLOCK();
@@ -725,7 +723,6 @@
 
     VIF_LOCK();
  
-    printf ("V_mcast: after VIF LOCK, before numvifs loop\n");
     /*
      * For each phyint in use, disable promiscuous reception of all IP
      * multicasts.
@@ -746,14 +743,11 @@
     V_numvifs = 0;
     V_pim_assert_enabled = 0;
     
-    printf ("V_mcast: before VIF UNLOCK, after numvifs loop\n");
     VIF_UNLOCK();
 
-    printf ("V_mcast: after VIF UNLOCK, before stopping callouts\n");
     callout_stop(&V_expire_upcalls_ch);
     callout_stop(&V_bw_upcalls_ch);
     callout_stop(&V_bw_meter_ch);
-    printf ("V_mcast: after stopping callouts\n");
 
     MFC_LOCK();
 
@@ -2838,7 +2832,6 @@
 vnet_mroute_uninit(const void *unused __unused)
 {
 
-	X_ip_mrouter_done();
 	FREE(V_nexpire, M_MRTABLE);
 	V_nexpire = NULL;
 }