Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src-draft/trunk]: src/sys/dev/pci Bring iwm_stop up to date for the new wifi...



details:   https://anonhg.NetBSD.org/src-all/rev/aaf3df6e0ef2
branches:  trunk
changeset: 367901:aaf3df6e0ef2
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Thu Sep 03 23:23:33 2020 +1000

description:
Bring iwm_stop up to date for the new wifi stack.

diffstat:

 sys/dev/pci/if_iwm.c |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (25 lines):

diff -r 7d54f9294eeb -r aaf3df6e0ef2 sys/dev/pci/if_iwm.c
--- a/sys/dev/pci/if_iwm.c      Thu Sep 03 23:15:08 2020 +1000
+++ b/sys/dev/pci/if_iwm.c      Thu Sep 03 23:23:33 2020 +1000
@@ -7007,19 +7007,15 @@
 iwm_stop(struct ifnet *ifp, int disable)
 {
        struct ieee80211vap *vap = ifp->if_softc;
-       struct ieee80211com *ic = vap->iv_ic;
-       struct iwm_softc *sc = ic->ic_softc;
+       struct iwm_softc *sc = vap->iv_ic->ic_softc;
 
        sc->sc_flags &= ~IWM_FLAG_HW_INITED;
        sc->sc_flags |= IWM_FLAG_STOPPED;
        sc->sc_generation++;
        ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
 
-       if (in)
-               in->in_phyctxt = NULL;
-
        if (vap->iv_state != IEEE80211_S_INIT)
-               ieee80211_new_state(ic, IEEE80211_S_INIT, -1);
+               ieee80211_new_state(vap, IEEE80211_S_INIT, -1);
 
        callout_stop(&sc->sc_calib_to);
        iwm_led_blink_stop(sc);



Home | Main Index | Thread Index | Old Index