[src-draft/trunk]: src/sys/dev/pci Some more converted to the new stack.

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

details:   https://anonhg.NetBSD.org/src-all/rev/e36ae33453c7
branches:  trunk
changeset: 375224:e36ae33453c7
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Tue Mar 08 04:02:14 2022 +1100

description:
Some more converted to the new stack.

diffstat:

 sys/dev/pci/if_ipw.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (53 lines):

diff -r 4df8b8a20c96 -r e36ae33453c7 sys/dev/pci/if_ipw.c
--- a/sys/dev/pci/if_ipw.c      Mon Mar 07 18:36:37 2022 +1100
+++ b/sys/dev/pci/if_ipw.c      Tue Mar 08 04:02:14 2022 +1100
@@ -1661,7 +1661,6 @@ ipw_start(struct ipw_softc *sc)
 
                KASSERT(m0->m_len >= sizeof(struct ether_header));
 
-               eh = mtod(m0, struct ether_header *);
                if (ni == NULL) {
                        m_freem(m0);
                        continue;
@@ -2105,6 +2104,7 @@ static int
 ipw_config(struct ipw_softc *sc)
 {
        struct ieee80211com *ic = &sc->sc_ic;
+       struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
        struct ifnet *ifp = &sc->sc_if;
        struct ipw_security security;
        struct ieee80211_key *k;
@@ -2128,6 +2128,8 @@ ipw_config(struct ipw_softc *sc)
        case IEEE80211_M_MONITOR:
                data = htole32(IPW_MODE_MONITOR);
                break;
+       default:
+               break;
        }
        DPRINTF(("Setting mode to %u\n", le32toh(data)));
        error = ipw_cmd(sc, IPW_CMD_SET_MODE, &data, sizeof data);
@@ -2136,7 +2138,7 @@ ipw_config(struct ipw_softc *sc)
 
        if (ic->ic_opmode == IEEE80211_M_IBSS ||
            ic->ic_opmode == IEEE80211_M_MONITOR) {
-               data = htole32(ieee80211_chan2ieee(ic, ic->ic_ibss_chan));
+               data = htole32(ieee80211_chan2ieee(ic, ic->ic_bsschan));
                DPRINTF(("Setting channel to %u\n", le32toh(data)));
                error = ipw_cmd(sc, IPW_CMD_SET_CHANNEL, &data, sizeof data);
                if (error != 0)
@@ -2195,13 +2197,13 @@ ipw_config(struct ipw_softc *sc)
                        return error;
        }
 
-       data = htole32(ic->ic_rtsthreshold);
+       data = htole32(vap->iv_rtsthreshold);
        DPRINTF(("Setting RTS threshold to %u\n", le32toh(data)));
        error = ipw_cmd(sc, IPW_CMD_SET_RTS_THRESHOLD, &data, sizeof data);
        if (error != 0)
                return error;
 
-       data = htole32(ic->ic_fragthreshold);
+       data = htole32(vap->iv_fragthreshold);
        DPRINTF(("Setting frag threshold to %u\n", le32toh(data)));
        error = ipw_cmd(sc, IPW_CMD_SET_FRAG_THRESHOLD, &data, sizeof data);
        if (error != 0)