> Date: Tue, 20 Jun 2017 13:34:57 +0200
> From: Stefan Sperling <s...@stsp.name>
>
> This fixed diff matches what was intended, and it still works (tested
> switching between networks and suspend/resume).
ok kettenis@
> Index: sys/dev/pci/if_iwm.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/if_iwm.c,v
> retrieving revision 1.197
> diff -u -p -r1.197 if_iwm.c
> --- sys/dev/pci/if_iwm.c 16 Jun 2017 08:45:34 -0000 1.197
> +++ sys/dev/pci/if_iwm.c 16 Jun 2017 11:47:09 -0000
> @@ -6106,9 +6106,6 @@ iwm_init(struct ifnet *ifp)
> struct ieee80211com *ic = &sc->sc_ic;
> int err, generation;
>
> - if (sc->sc_flags & IWM_FLAG_HW_INITED) {
> - return 0;
> - }
> sc->sc_generation++;
>
> err = iwm_init_hw(sc);
> @@ -6135,8 +6132,6 @@ iwm_init(struct ifnet *ifp)
> return err;
> } while (ic->ic_state != IEEE80211_S_SCAN);
>
> - sc->sc_flags |= IWM_FLAG_HW_INITED;
> -
> return 0;
> }
>
> @@ -6214,7 +6209,6 @@ iwm_stop(struct ifnet *ifp, int disable)
> struct ieee80211com *ic = &sc->sc_ic;
> struct iwm_node *in = (void *)ic->ic_bss;
>
> - sc->sc_flags &= ~IWM_FLAG_HW_INITED;
> sc->sc_generation++;
> ic->ic_scan_lock = IEEE80211_SCAN_UNLOCKED;
> ifp->if_flags &= ~IFF_RUNNING;
> @@ -7450,7 +7444,7 @@ iwm_init_task(void *arg1)
> }
> s = splnet();
>
> - if (sc->sc_flags & IWM_FLAG_HW_INITED)
> + if (ifp->if_flags & IFF_RUNNING)
> iwm_stop(ifp, 0);
> if ((ifp->if_flags & (IFF_UP | IFF_RUNNING)) == IFF_UP)
> iwm_init(ifp);
> Index: sys/dev/pci/if_iwmvar.h
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/if_iwmvar.h,v
> retrieving revision 1.28
> diff -u -p -r1.28 if_iwmvar.h
> --- sys/dev/pci/if_iwmvar.h 14 Jun 2017 16:56:04 -0000 1.28
> +++ sys/dev/pci/if_iwmvar.h 14 Jun 2017 19:17:23 -0000
> @@ -280,9 +280,8 @@ struct iwm_rx_ring {
> };
>
> #define IWM_FLAG_USE_ICT 0x01
> -#define IWM_FLAG_HW_INITED 0x02
> -#define IWM_FLAG_RFKILL 0x04
> -#define IWM_FLAG_SCANNING 0x08
> +#define IWM_FLAG_RFKILL 0x02
> +#define IWM_FLAG_SCANNING 0x04
>
> struct iwm_ucode_status {
> uint32_t uc_error_event_table;
>
>
