diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2019-07-03 21:05:40 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2019-07-03 21:05:40 +0000 |
| commit | dda0c86204443ea00db28b82e0336e39c0bb94b1 (patch) | |
| tree | fbc11308d5adeb152eaaa37ae791a16e6ceb1062 /sys | |
| parent | 23023517917d299c52b2f92ef30743a0d2acd6e6 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/iwm/if_iwm.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c index b32f728ab7c8..067768dcd0f8 100644 --- a/sys/dev/iwm/if_iwm.c +++ b/sys/dev/iwm/if_iwm.c @@ -6330,12 +6330,9 @@ iwm_detach_local(struct iwm_softc *sc, int do_net80211) if (!sc->sc_attached) return 0; sc->sc_attached = 0; - - if (do_net80211) + if (do_net80211) { ieee80211_draintask(&sc->sc_ic, &sc->sc_es_task); - - callout_drain(&sc->sc_led_blink_to); - callout_drain(&sc->sc_watchdog_to); + } iwm_stop_device(sc); if (do_net80211) { IWM_LOCK(sc); @@ -6343,6 +6340,8 @@ iwm_detach_local(struct iwm_softc *sc, int do_net80211) IWM_UNLOCK(sc); ieee80211_ifdetach(&sc->sc_ic); } + callout_drain(&sc->sc_led_blink_to); + callout_drain(&sc->sc_watchdog_to); iwm_phy_db_free(sc->sc_phy_db); sc->sc_phy_db = NULL; |
