[src-draft/trunk]: src/sys/dev/pci ic_state-> vap->iv_state.

[Nathanial Sloss <nat%netbsd.org@localhost>]

details:   https://anonhg.NetBSD.org/src-all/rev/141f71171438
branches:  trunk
changeset: 367886:141f71171438
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Thu Sep 03 22:02:27 2020 +1000

description:
ic_state-> vap->iv_state.

diffstat:

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

diffs (57 lines):

diff -r 166593dca6e5 -r 141f71171438 sys/dev/pci/if_iwm.c
--- a/sys/dev/pci/if_iwm.c      Thu Sep 03 21:56:29 2020 +1000
+++ b/sys/dev/pci/if_iwm.c      Thu Sep 03 22:02:27 2020 +1000
@@ -6286,7 +6286,7 @@
        struct ifnet *ifp = vap->iv_ifp;
        struct ieee80211com *ic = vap->iv_ic;
        struct iwm_softc *sc = ic->ic_softc;
-       enum ieee80211_state ostate = ic->ic_state;
+       enum ieee80211_state ostate = vap->iv_state;
        struct iwm_node *in;
        int err;
 
@@ -6338,7 +6338,7 @@
                        return err;
                }
                SET(sc->sc_flags, IWM_FLAG_SCANNING);
-               ic->ic_state = nstate;
+               vap->iv_state = nstate;
                iwm_led_blink_start(sc);
                return 0;
 
@@ -6439,7 +6439,7 @@
 
        s = splnet();
 
-       DPRINTF(("Prepare to switch state %d->%d\n", ic->ic_state, nstate));
+//     DPRINTF(("Prepare to switch state %d->%d\n", ic->ic_state, nstate));
        if (sc->sc_generation != generation) {
                DPRINTF(("newstate_cb: someone pulled the plug meanwhile\n"));
                if (nstate == IEEE80211_S_INIT) {
@@ -6954,7 +6954,7 @@
                        ac = WME_AC_BE;
                        goto sendit;
                }
-               if (ic->ic_state != IEEE80211_S_RUN) {
+               if (vap->iv_state != IEEE80211_S_RUN) {
                        break;
                }
 
@@ -7014,7 +7014,7 @@
        if (in)
                in->in_phyctxt = NULL;
 
-       if (ic->ic_state != IEEE80211_S_INIT)
+       if (vap->iv_state != IEEE80211_S_INIT)
                ieee80211_new_state(ic, IEEE80211_S_INIT, -1);
 
        callout_stop(&sc->sc_calib_to);
@@ -7761,7 +7761,7 @@
                }
                DPRINTF(("  rx ring: cur=%d\n", sc->rxq.cur));
                DPRINTF(("  802.11 state %s\n",
-                   ieee80211_state_name[sc->sc_ic.ic_state]));
+                   ieee80211_state_name[vap->iv_state]));
 #endif
 
                aprint_error_dev(sc->sc_dev, "fatal firmware error\n");