svn commit: r343385 - head/sys/dev/iwm

[Kyle Evans]

Author: kevans
Date: Thu Jan 24 03:48:27 2019
New Revision: 343385
URL: https://svnweb.freebsd.org/changeset/base/343385

Log:
  iwm - Always clear watchdog timer, when bringing down firmware state.
  
  Submitted by:	Augustin Cavalier <waddlesplash at gmail.com> (Haiku)
  Obtained from:	DragonFlyBSD (8abdc2b36a45c4e9c95fc8263ca532ea26633dcb)

Modified:
  head/sys/dev/iwm/if_iwm.c

Modified: head/sys/dev/iwm/if_iwm.c
==============================================================================
--- head/sys/dev/iwm/if_iwm.c	Thu Jan 24 03:47:47 2019	(r343384)
+++ head/sys/dev/iwm/if_iwm.c	Thu Jan 24 03:48:27 2019	(r343385)
@@ -4225,6 +4225,9 @@ iwm_bring_down_firmware(struct iwm_softc *sc, struct i
 	struct iwm_vap *ivp = IWM_VAP(vap);
 	int error;
 
+	/* Avoid Tx watchdog triggering, when transfers get dropped here. */
+	sc->sc_tx_timer = 0;
+
 	ivp->iv_auth = 0;
 	if (sc->sc_firmware_state == 3) {
 		iwm_xmit_queue_drain(sc);
@@ -4328,10 +4331,6 @@ iwm_newstate(struct ieee80211vap *vap, enum ieee80211_
 
 	IEEE80211_UNLOCK(ic);
 	IWM_LOCK(sc);
-
-	/* Avoid Tx watchdog triggering, when a connectionm is dropped. */
-	if (vap->iv_state == IEEE80211_S_RUN && nstate != IEEE80211_S_RUN)
-		sc->sc_tx_timer = 0;
 
 	if ((sc->sc_flags & IWM_FLAG_SCAN_RUNNING) &&
 	    (nstate == IEEE80211_S_AUTH ||