d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iwm - Always clear watchdog timer, when bringing down firmware state.

Browse Source 
Submitted by:	Augustin Cavalier <waddlesplash@gmail.com> (Haiku)
Obtained from:	DragonFlyBSD (8abdc2b36a45c4e9c95fc8263ca532ea26633dcb)
This commit is contained in:
Kyle Evans 2019-01-24 03:48:27 +00:00
parent df34d80aa7
commit d3c83cfead
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=343385
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/iwm/if_iwm.c
View File

@ -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 ||