[src-draft/trunk]: src/sys/dev/pci Fix more variable definition botches.

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

details:   https://anonhg.NetBSD.org/src-all/rev/ae9cccb51497
branches:  trunk
changeset: 376870:ae9cccb51497
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Thu Sep 03 21:37:14 2020 +1000

description:
Fix more variable definition botches.

diffstat:

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

diffs (28 lines):

diff -r 0acc89d825cd -r ae9cccb51497 sys/dev/pci/if_iwm.c
--- a/sys/dev/pci/if_iwm.c      Thu Sep 03 21:29:10 2020 +1000
+++ b/sys/dev/pci/if_iwm.c      Thu Sep 03 21:37:14 2020 +1000
@@ -3814,6 +3814,7 @@ iwm_run_init_mvm_ucode(struct iwm_softc 
        if (err)
                return err;
 
+       struct ieee80211vap *vap = TAILQ_FIRST(&sc->sc_ic.ic_vaps);
        err = iwm_sf_config(vap, IWM_SF_INIT_OFF);
        if (err)
                return err;
@@ -4150,6 +4151,7 @@ iwm_rx_tx_cmd(struct ieee80211vap *vap, 
     struct iwm_rx_data *data)
 {
        struct ifnet *ifp = vap->iv_ifp;
+       struct iwm_softc *sc = vap->iv_ic->ic_softc;
        struct iwm_cmd_header *cmd_hdr = &pkt->hdr;
        int idx = cmd_hdr->idx;
        int qid = cmd_hdr->qid;
@@ -7693,7 +7695,7 @@ static void
 iwm_softintr(void *arg)
 {
        struct iwm_softc *sc = arg;
-       struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
+       struct ieee80211vap *vap = TAILQ_FIRST(&sc->sc_ic.ic_vaps);
        struct ifnet *ifp = vap->iv_ifp);
        uint32_t r1, r2;
        int isperiodic = 0, s;