Author: eadler
Date: Thu Mar  1 05:05:08 2018
New Revision: 330159
URL: https://svnweb.freebsd.org/changeset/base/330159

Log:
  MFC r308577:
  
  iwm: If firmware load fails during init via iwm_preinit() we bail out
  before calling ieee80211_ifattach() so the taskqueue hasn't been
  initialized. Don't try to drain it, we'll panic.
  Looks like this issue was introduced in r303326.

Modified:
  stable/11/sys/dev/iwm/if_iwm.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/iwm/if_iwm.c
==============================================================================
--- stable/11/sys/dev/iwm/if_iwm.c      Thu Mar  1 05:03:18 2018        
(r330158)
+++ stable/11/sys/dev/iwm/if_iwm.c      Thu Mar  1 05:05:08 2018        
(r330159)
@@ -6172,7 +6172,8 @@ iwm_detach_local(struct iwm_softc *sc, int do_net80211
        device_t dev = sc->sc_dev;
        int i;
 
-       ieee80211_draintask(&sc->sc_ic, &sc->sc_es_task);
+       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);
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to