From: Joe Talbott <josepht@dragonflybsd.org>
Date: Sun, 18 Jul 2010 23:16:29 +0000 (-0400)
Subject: iwn - Lock iwn_timer_timeout callback.
X-Git-Tag: v2.8.0~700
X-Git-Url: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/b008e137d810d6898944ef77383fb8115110db91

iwn - Lock iwn_timer_timeout callback.
---

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