diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2019-01-24 03:48:27 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2019-01-24 03:48:27 +0000 |
| commit | d3c83cfead835e74de93dd68038fc3f4ad4ae1a0 (patch) | |
| tree | 2a223af740ade33332850ac9eacfe7c18e216972 /sys/dev/iwm | |
| parent | df34d80aa79fdebdc42c80a9974ed69ccf20c276 (diff) | |
Notes
Diffstat (limited to 'sys/dev/iwm')
| -rw-r--r-- | sys/dev/iwm/if_iwm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c index 0a971f60491a4..2422ff9e31641 100644 --- a/sys/dev/iwm/if_iwm.c +++ b/sys/dev/iwm/if_iwm.c @@ -4225,6 +4225,9 @@ iwm_bring_down_firmware(struct iwm_softc *sc, struct ieee80211vap *vap) 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); @@ -4329,10 +4332,6 @@ iwm_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) 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 || nstate == IEEE80211_S_ASSOC || |