From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Fri, 8 Aug 2014 23:49:38 +0000 (-0700)
Subject: kernel - Fix serialization bug in if_ath
X-Git-Tag: v4.1.0~310
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/694b3ef6425a6735536e93eb80fa7e8c72230811?ds=sidebyside

kernel - Fix serialization bug in if_ath

* Fix a bug which was causing a serialization assertion to fail.
---

diff --git a/sys/dev/netif/ath/ath/if_ath.c b/sys/dev/netif/ath/ath/if_ath.c
index 279f7ce735..634dd99cb8 100644
--- a/sys/dev/netif/ath/ath/if_ath.c
+++ b/sys/dev/netif/ath/ath/if_ath.c
@@ -5485,11 +5485,11 @@ ath_calibrate(void *arg)
 	 */
 	ath_power_set_power_state(sc, HAL_PM_AWAKE);
 
+	wlan_serialize_enter();
+
 	/* Skip trying to do this if we're in reset */
 	if (sc->sc_inreset_cnt)
 		goto restart;
-
-	wlan_serialize_enter();
 	if (ic->ic_flags & IEEE80211_F_SCAN)	/* defer, off channel */
 		goto restart;
 	longCal = (ticks - sc->sc_lastlongcal >= ath_longcalinterval*hz);