From b008e137d810d6898944ef77383fb8115110db91 Mon Sep 17 00:00:00 2001 From: Joe Talbott Date: Sun, 18 Jul 2010 19:16:29 -0400 Subject: [PATCH] iwn - Lock iwn_timer_timeout callback. --- sys/dev/netif/iwn/if_iwn.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/sys/dev/netif/iwn/if_iwn.c b/sys/dev/netif/iwn/if_iwn.c index 63479f2..a7ad6d2 100644 --- a/sys/dev/netif/iwn/if_iwn.c +++ b/sys/dev/netif/iwn/if_iwn.c @@ -2005,7 +2005,7 @@ iwn_timer_timeout(void *arg) struct iwn_softc *sc = arg; uint32_t flags = 0; - IWN_LOCK_ASSERT(sc); + IWN_LOCK(sc); if (sc->calib_cnt && --sc->calib_cnt == 0) { DPRINTF(sc, IWN_DEBUG_CALIBRATE, "%s\n", @@ -2016,6 +2016,7 @@ iwn_timer_timeout(void *arg) } iwn_watchdog(sc); /* NB: piggyback tx watchdog */ callout_reset(&sc->sc_timer_to, hz, iwn_timer_timeout, sc); + IWN_UNLOCK(sc); } static void -- 1.7.7.2