Date: Fri, 22 Aug 2003 09:27:04 -0700 (PDT) From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 36675 for review Message-ID: <200308221627.h7MGR4mH023706@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=36675 Change 36675 by sam@sam_ebb on 2003/08/22 09:26:20 o use lower case for mutex name o destroy mutex on module unload o move unload logic to separate function Affected files ... .. //depot/projects/netperf/sys/net/bridge.c#4 edit Differences ... ==== //depot/projects/netperf/sys/net/bridge.c#4 (text+ko) ==== @@ -1158,7 +1158,7 @@ if (ifp2sc == NULL) return ENOMEM; - mtx_init(&bdg_mtx, "Bridge", NULL, MTX_DEF); + mtx_init(&bdg_mtx, "bridge", NULL, MTX_DEF); n_clusters = 0; clusters = NULL; @@ -1177,6 +1177,27 @@ return 0 ; } +#ifdef KLD_MODULE +static void +bdgdestroy(void) +{ + bridge_in_ptr = NULL; + bdg_forward_ptr = NULL; + bdgtakeifaces_ptr = NULL; + + callout_stop(&bdg_callout); + bridge_off(); + + if (clusters) + free(clusters, M_IFADDR); + if (ifp2sc) { + free(ifp2sc, M_IFADDR); + ifp2sc = NULL; + } + mtx_destroy(&bdg_mtx); +} +#endif /* KLD_MODULE */ + /* * initialization code, both for static and dynamic loading. */ @@ -1200,15 +1221,7 @@ #else /* XXX lock */ do_bridge = 0; - bridge_in_ptr = NULL; - bdg_forward_ptr = NULL; - bdgtakeifaces_ptr = NULL; - callout_stop(&bdg_callout); - bridge_off(); - if (clusters) - free(clusters, M_IFADDR); - free(ifp2sc, M_IFADDR); - ifp2sc = NULL ; + bdgdestroy(); #endif break; default:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200308221627.h7MGR4mH023706>