Date: Fri, 21 May 2010 17:34:39 GMT From: Ivor Prebeg <iprebeg@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 178600 for review Message-ID: <201005211734.o4LHYd7N067680@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005211734.o4LHYd7N067680>