From 6a6f469496a663d96a26ff7025537616f39e72ff Mon Sep 17 00:00:00 2001 From: Aggelos Economopoulos Date: Sat, 4 Jul 2009 02:25:05 +0300 Subject: [PATCH] get mxge to build, stage 4/many - replace callout_init_mtx() with explicit locking --- sys/dev/netif/mxge/if_mxge.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/netif/mxge/if_mxge.c b/sys/dev/netif/mxge/if_mxge.c index b1da6636e4..fc0c080ee1 100644 --- a/sys/dev/netif/mxge/if_mxge.c +++ b/sys/dev/netif/mxge/if_mxge.c @@ -3822,6 +3822,7 @@ mxge_tick(void *arg) mxge_softc_t *sc = arg; int err = 0; + lockmgr(&sc->driver_lock, LK_EXCLUSIVE); /* aggregate stats from different slices */ mxge_update_stats(sc); if (!sc->watchdog_countdown) { @@ -3831,7 +3832,7 @@ mxge_tick(void *arg) sc->watchdog_countdown--; if (err == 0) callout_reset(&sc->co_hdl, mxge_ticks, mxge_tick, sc); - + lockmgr(&sc->driver_lock, LK_RELEASE); } static int @@ -4478,7 +4479,7 @@ mxge_attach(device_t dev) lock_init(&sc->driver_lock, sc->driver_lock_name, 0, LK_CANRECURSE); - callout_init_mtx(&sc->co_hdl, &sc->driver_lock, 0); + callout_init(&sc->co_hdl); mxge_setup_cfg_space(sc); -- 2.41.0