Date: Thu, 24 Jan 2019 03:46:35 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r343382 - head/sys/dev/iwm Message-ID: <201901240346.x0O3kZXE025933@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Thu Jan 24 03:46:35 2019 New Revision: 343382 URL: https://svnweb.freebsd.org/changeset/base/343382 Log: iwm - Avoid Tx watchdog timeout, when dropping a connection. Submitted by: Augustin Cavalier <waddlesplash@gmail.com> (Haiku) Obtained from: DragonFlyBSD (3e12596fb5c55351517cdd741d72979388a8c75c) 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:45:55 2019 (r343381) +++ head/sys/dev/iwm/if_iwm.c Thu Jan 24 03:46:35 2019 (r343382) @@ -4329,6 +4329,10 @@ 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 || nstate == IEEE80211_S_ASSOC ||
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901240346.x0O3kZXE025933>