Author: adrian
Date: Mon Aug 17 23:44:38 2015
New Revision: 286865
URL: https://svnweb.freebsd.org/changeset/base/286865

Log:
  Convert more ifp->if_softc -> ic->ic_softc.
  
  These should be a big no-op.
  
  Tested:
  
  * make universe

Modified:
  head/sys/dev/bwi/if_bwi.c
  head/sys/dev/bwn/if_bwn.c
  head/sys/dev/ipw/if_ipw.c
  head/sys/dev/iwm/if_iwm.c
  head/sys/dev/wi/if_wi.c
  head/sys/dev/wpi/if_wpi.c

Modified: head/sys/dev/bwi/if_bwi.c
==============================================================================
--- head/sys/dev/bwi/if_bwi.c   Mon Aug 17 23:35:31 2015        (r286864)
+++ head/sys/dev/bwi/if_bwi.c   Mon Aug 17 23:44:38 2015        (r286865)
@@ -1444,7 +1444,7 @@ bwi_raw_xmit(struct ieee80211_node *ni, 
 {
        struct ieee80211com *ic = ni->ni_ic;
        struct ifnet *ifp = ic->ic_ifp;
-       struct bwi_softc *sc = ifp->if_softc;
+       struct bwi_softc *sc = ic->ic_softc;
        /* XXX wme? */
        struct bwi_txbuf_data *tbd = &sc->sc_tx_bdata[BWI_TX_DATA_RING];
        int idx, error;
@@ -1728,7 +1728,7 @@ bwi_intr(void *xsc)
 static void
 bwi_scan_start(struct ieee80211com *ic)
 {
-       struct bwi_softc *sc = ic->ic_ifp->if_softc;
+       struct bwi_softc *sc = ic->ic_softc;
 
        BWI_LOCK(sc);
        /* Enable MAC beacon promiscuity */
@@ -1739,7 +1739,7 @@ bwi_scan_start(struct ieee80211com *ic)
 static void
 bwi_set_channel(struct ieee80211com *ic)
 {
-       struct bwi_softc *sc = ic->ic_ifp->if_softc;
+       struct bwi_softc *sc = ic->ic_softc;
        struct ieee80211_channel *c = ic->ic_curchan;
        struct bwi_mac *mac;
 
@@ -1765,7 +1765,7 @@ bwi_set_channel(struct ieee80211com *ic)
 static void
 bwi_scan_end(struct ieee80211com *ic)
 {
-       struct bwi_softc *sc = ic->ic_ifp->if_softc;
+       struct bwi_softc *sc = ic->ic_softc;
 
        BWI_LOCK(sc);
        CSR_CLRBITS_4(sc, BWI_MAC_STATUS, BWI_MAC_STATUS_PASS_BCN);
@@ -1776,10 +1776,9 @@ static int
 bwi_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 {
        struct bwi_vap *bvp = BWI_VAP(vap);
-       struct ieee80211com *ic= vap->iv_ic;
-       struct ifnet *ifp = ic->ic_ifp;
+       struct ieee80211com *ic = vap->iv_ic;
        enum ieee80211_state ostate = vap->iv_state;
-       struct bwi_softc *sc = ifp->if_softc;
+       struct bwi_softc *sc = ic->ic_softc;
        struct bwi_mac *mac;
        int error;
 

Modified: head/sys/dev/bwn/if_bwn.c
==============================================================================
--- head/sys/dev/bwn/if_bwn.c   Mon Aug 17 23:35:31 2015        (r286864)
+++ head/sys/dev/bwn/if_bwn.c   Mon Aug 17 23:44:38 2015        (r286865)
@@ -2736,7 +2736,7 @@ bwn_raw_xmit(struct ieee80211_node *ni, 
 {
        struct ieee80211com *ic = ni->ni_ic;
        struct ifnet *ifp = ic->ic_ifp;
-       struct bwn_softc *sc = ifp->if_softc;
+       struct bwn_softc *sc = ic->ic_softc;
        struct bwn_mac *mac = sc->sc_curmac;
 
        if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0 ||
@@ -2817,7 +2817,7 @@ bwn_update_promisc(struct ieee80211com *
 static int
 bwn_wme_update(struct ieee80211com *ic)
 {
-       struct bwn_softc *sc = ic->ic_ifp->if_softc;
+       struct bwn_softc *sc = ic->ic_softc;
        struct bwn_mac *mac = sc->sc_curmac;
        struct wmeParams *wmep;
        int i;
@@ -2839,8 +2839,7 @@ bwn_wme_update(struct ieee80211com *ic)
 static void
 bwn_scan_start(struct ieee80211com *ic)
 {
-       struct ifnet *ifp = ic->ic_ifp;
-       struct bwn_softc *sc = ifp->if_softc;
+       struct bwn_softc *sc = ic->ic_softc;
        struct bwn_mac *mac;
 
        BWN_LOCK(sc);
@@ -2857,8 +2856,7 @@ bwn_scan_start(struct ieee80211com *ic)
 static void
 bwn_scan_end(struct ieee80211com *ic)
 {
-       struct ifnet *ifp = ic->ic_ifp;
-       struct bwn_softc *sc = ifp->if_softc;
+       struct bwn_softc *sc = ic->ic_softc;
        struct bwn_mac *mac;
 
        BWN_LOCK(sc);
@@ -2874,8 +2872,7 @@ bwn_scan_end(struct ieee80211com *ic)
 static void
 bwn_set_channel(struct ieee80211com *ic)
 {
-       struct ifnet *ifp = ic->ic_ifp;
-       struct bwn_softc *sc = ifp->if_softc;
+       struct bwn_softc *sc = ic->ic_softc;
        struct bwn_mac *mac = sc->sc_curmac;
        struct bwn_phy *phy = &mac->mac_phy;
        int chan, error;
@@ -2933,8 +2930,7 @@ bwn_vap_create(struct ieee80211com *ic, 
     const uint8_t bssid[IEEE80211_ADDR_LEN],
     const uint8_t mac0[IEEE80211_ADDR_LEN])
 {
-       struct ifnet *ifp = ic->ic_ifp;
-       struct bwn_softc *sc = ifp->if_softc;
+       struct bwn_softc *sc = ic->ic_softc;
        struct ieee80211vap *vap;
        struct bwn_vap *bvp;
        uint8_t mac[IEEE80211_ADDR_LEN];
@@ -8331,7 +8327,7 @@ bwn_newstate(struct ieee80211vap *vap, e
        struct ieee80211com *ic= vap->iv_ic;
        struct ifnet *ifp = ic->ic_ifp;
        enum ieee80211_state ostate = vap->iv_state;
-       struct bwn_softc *sc = ifp->if_softc;
+       struct bwn_softc *sc = ic->ic_softc;
        struct bwn_mac *mac = sc->sc_curmac;
        int error;
 

Modified: head/sys/dev/ipw/if_ipw.c
==============================================================================
--- head/sys/dev/ipw/if_ipw.c   Mon Aug 17 23:35:31 2015        (r286864)
+++ head/sys/dev/ipw/if_ipw.c   Mon Aug 17 23:44:38 2015        (r286865)
@@ -428,8 +428,7 @@ ipw_vap_create(struct ieee80211com *ic, 
     const uint8_t bssid[IEEE80211_ADDR_LEN],
     const uint8_t mac[IEEE80211_ADDR_LEN])
 {
-       struct ifnet *ifp = ic->ic_ifp;
-       struct ipw_softc *sc = ifp->if_softc;
+       struct ipw_softc *sc = ic->ic_softc;
        struct ipw_vap *ivp;
        struct ieee80211vap *vap;
        const struct firmware *fp;
@@ -866,7 +865,7 @@ ipw_media_status(struct ifnet *ifp, stru
 {
        struct ieee80211vap *vap = ifp->if_softc;
        struct ieee80211com *ic = vap->iv_ic;
-       struct ipw_softc *sc = ic->ic_ifp->if_softc;
+       struct ipw_softc *sc = ic->ic_softc;
 
        /* read current transmission rate from adapter */
        vap->iv_bss->ni_txrate = ipw_cvtrate(
@@ -879,8 +878,7 @@ ipw_newstate(struct ieee80211vap *vap, e
 {
        struct ipw_vap *ivp = IPW_VAP(vap);
        struct ieee80211com *ic = vap->iv_ic;
-       struct ifnet *ifp = ic->ic_ifp;
-       struct ipw_softc *sc = ifp->if_softc;
+       struct ipw_softc *sc = ic->ic_softc;
        enum ieee80211_state ostate;
 
        DPRINTF(("%s: %s -> %s flags 0x%x\n", __func__,
@@ -1581,8 +1579,8 @@ ipw_cmd(struct ipw_softc *sc, uint32_t t
 static int
 ipw_tx_start(struct ifnet *ifp, struct mbuf *m0, struct ieee80211_node *ni)
 {
-       struct ipw_softc *sc = ifp->if_softc;
        struct ieee80211com *ic = ifp->if_l2com;
+       struct ipw_softc *sc = ic->ic_softc;
        struct ieee80211vap *vap = ni->ni_vap;
        struct ieee80211_frame *wh;
        struct ipw_soft_bd *sbd;
@@ -2217,8 +2215,7 @@ ipw_setchannel(struct ipw_softc *sc, str
 static void
 ipw_assoc(struct ieee80211com *ic, struct ieee80211vap *vap)
 {
-       struct ifnet *ifp = vap->iv_ic->ic_ifp;
-       struct ipw_softc *sc = ifp->if_softc;
+       struct ipw_softc *sc = ic->ic_softc;
        struct ieee80211_node *ni = vap->iv_bss;
        struct ipw_security security;
        uint32_t data;
@@ -2309,9 +2306,8 @@ done:
 static void
 ipw_disassoc(struct ieee80211com *ic, struct ieee80211vap *vap)
 {
-       struct ifnet *ifp = vap->iv_ic->ic_ifp;
        struct ieee80211_node *ni = vap->iv_bss;
-       struct ipw_softc *sc = ifp->if_softc;
+       struct ipw_softc *sc = ic->ic_softc;
 
        IPW_LOCK(sc);
        DPRINTF(("Disassociate from %6D\n", ni->ni_bssid, ":"));
@@ -2677,8 +2673,7 @@ ipw_write_mem_1(struct ipw_softc *sc, bu
 static void
 ipw_scan_start(struct ieee80211com *ic)
 {
-       struct ifnet *ifp = ic->ic_ifp;
-       struct ipw_softc *sc = ifp->if_softc;
+       struct ipw_softc *sc = ic->ic_softc;
 
        IPW_LOCK(sc);
        ipw_scan(sc);
@@ -2688,8 +2683,7 @@ ipw_scan_start(struct ieee80211com *ic)
 static void
 ipw_set_channel(struct ieee80211com *ic)
 {
-       struct ifnet *ifp = ic->ic_ifp;
-       struct ipw_softc *sc = ifp->if_softc;
+       struct ipw_softc *sc = ic->ic_softc;
 
        IPW_LOCK(sc);
        if (ic->ic_opmode == IEEE80211_M_MONITOR) {
@@ -2715,8 +2709,7 @@ ipw_scan_mindwell(struct ieee80211_scan_
 static void
 ipw_scan_end(struct ieee80211com *ic)
 {
-       struct ifnet *ifp = ic->ic_ifp;
-       struct ipw_softc *sc = ifp->if_softc;
+       struct ipw_softc *sc = ic->ic_softc;
 
        IPW_LOCK(sc);
        sc->flags &= ~IPW_FLAG_SCANNING;

Modified: head/sys/dev/iwm/if_iwm.c
==============================================================================
--- head/sys/dev/iwm/if_iwm.c   Mon Aug 17 23:35:31 2015        (r286864)
+++ head/sys/dev/iwm/if_iwm.c   Mon Aug 17 23:44:38 2015        (r286865)
@@ -2874,7 +2874,7 @@ iwm_raw_xmit(struct ieee80211_node *ni, 
 {
        struct ieee80211com *ic = ni->ni_ic;
        struct ifnet *ifp = ic->ic_ifp;
-       struct iwm_softc *sc = ifp->if_softc;
+       struct iwm_softc *sc = ic->ic_softc;
        int error = 0;
 
        IWM_DPRINTF(sc, IWM_DEBUG_XMIT,
@@ -3510,8 +3510,7 @@ iwm_newstate(struct ieee80211vap *vap, e
 {
        struct iwm_vap *ivp = IWM_VAP(vap);
        struct ieee80211com *ic = vap->iv_ic;
-       struct ifnet *ifp = ic->ic_ifp;
-       struct iwm_softc *sc = ifp->if_softc;
+       struct iwm_softc *sc = ic->ic_softc;
        struct iwm_node *in;
        int error;
 
@@ -4820,7 +4819,7 @@ fail:
 static int
 iwm_update_edca(struct ieee80211com *ic)
 {
-       struct iwm_softc *sc = ic->ic_ifp->if_softc;
+       struct iwm_softc *sc = ic->ic_softc;
 
        device_printf(sc->sc_dev, "%s: called\n", __func__);
        return (0);
@@ -4960,7 +4959,7 @@ static void
 iwm_scan_start(struct ieee80211com *ic)
 {
        struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
-        struct iwm_softc *sc = ic->ic_ifp->if_softc;
+        struct iwm_softc *sc = ic->ic_softc;
        int error;
 
        if (sc->sc_scanband)

Modified: head/sys/dev/wi/if_wi.c
==============================================================================
--- head/sys/dev/wi/if_wi.c     Mon Aug 17 23:35:31 2015        (r286864)
+++ head/sys/dev/wi/if_wi.c     Mon Aug 17 23:44:38 2015        (r286865)
@@ -520,7 +520,7 @@ wi_vap_create(struct ieee80211com *ic, c
     const uint8_t bssid[IEEE80211_ADDR_LEN],
     const uint8_t mac[IEEE80211_ADDR_LEN])
 {
-       struct wi_softc *sc = ic->ic_ifp->if_softc;
+       struct wi_softc *sc = ic->ic_softc;
        struct wi_vap *wvp;
        struct ieee80211vap *vap;
 
@@ -750,8 +750,7 @@ wi_stop(struct wi_softc *sc, int disable
 static void
 wi_set_channel(struct ieee80211com *ic)
 {
-       struct ifnet *ifp = ic->ic_ifp;
-       struct wi_softc *sc = ifp->if_softc;
+       struct wi_softc *sc = ic->ic_softc;
 
        DPRINTF(("%s: channel %d, %sscanning\n", __func__,
            ieee80211_chan2ieee(ic, ic->ic_curchan),
@@ -766,8 +765,7 @@ wi_set_channel(struct ieee80211com *ic)
 static void
 wi_scan_start(struct ieee80211com *ic)
 {
-       struct ifnet *ifp = ic->ic_ifp;
-       struct wi_softc *sc = ifp->if_softc;
+       struct wi_softc *sc = ic->ic_softc;
        struct ieee80211_scan_state *ss = ic->ic_scan;
 
        DPRINTF(("%s\n", __func__));
@@ -790,8 +788,7 @@ wi_scan_start(struct ieee80211com *ic)
 static void
 wi_scan_end(struct ieee80211com *ic)
 {
-       struct ifnet *ifp = ic->ic_ifp;
-       struct wi_softc *sc = ifp->if_softc;
+       struct wi_softc *sc = ic->ic_softc;
 
        DPRINTF(("%s: restore port type %d\n", __func__, sc->sc_porttype));
 
@@ -824,9 +821,8 @@ static int
 wi_newstate_sta(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 {
        struct ieee80211com *ic = vap->iv_ic;
-       struct ifnet *ifp = ic->ic_ifp;
        struct ieee80211_node *bss;
-       struct wi_softc *sc = ifp->if_softc;
+       struct wi_softc *sc = ic->ic_softc;
 
        DPRINTF(("%s: %s -> %s\n", __func__,
                ieee80211_state_name[vap->iv_state],
@@ -894,9 +890,8 @@ static int
 wi_newstate_hostap(struct ieee80211vap *vap, enum ieee80211_state nstate, int 
arg)
 {
        struct ieee80211com *ic = vap->iv_ic;
-       struct ifnet *ifp = ic->ic_ifp;
        struct ieee80211_node *bss;
-       struct wi_softc *sc = ifp->if_softc;
+       struct wi_softc *sc = ic->ic_softc;
        int error;
 
        DPRINTF(("%s: %s -> %s\n", __func__,
@@ -1082,7 +1077,7 @@ wi_raw_xmit(struct ieee80211_node *ni, s
        struct ieee80211com *ic = ni->ni_ic;
        struct ifnet *ifp = ic->ic_ifp;
        struct ieee80211vap *vap = ni->ni_vap;
-       struct wi_softc *sc = ifp->if_softc;
+       struct wi_softc *sc = ic->ic_softc;
        struct ieee80211_key *k;
        struct ieee80211_frame *wh;
        struct wi_frame frmhdr;
@@ -1252,7 +1247,7 @@ wi_media_status(struct ifnet *ifp, struc
 {
        struct ieee80211vap *vap = ifp->if_softc;
        struct ieee80211com *ic = vap->iv_ic;
-       struct wi_softc *sc = ic->ic_ifp->if_softc;
+       struct wi_softc *sc = ic->ic_softc;
        u_int16_t val;
        int rate, len;
 

Modified: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c   Mon Aug 17 23:35:31 2015        (r286864)
+++ head/sys/dev/wpi/if_wpi.c   Mon Aug 17 23:44:38 2015        (r286865)
@@ -1549,8 +1549,7 @@ static int
 wpi_setregdomain(struct ieee80211com *ic, struct ieee80211_regdomain *rd,
     int nchan, struct ieee80211_channel chans[])
 {
-       struct ifnet *ifp = ic->ic_ifp;
-       struct wpi_softc *sc = ifp->if_softc;
+       struct wpi_softc *sc = ic->ic_softc;
        int i;
 
        for (i = 0; i < nchan; i++) {
@@ -1673,7 +1672,7 @@ static void
 wpi_node_free(struct ieee80211_node *ni)
 {
        struct ieee80211com *ic = ni->ni_ic;
-       struct wpi_softc *sc = ic->ic_ifp->if_softc;
+       struct wpi_softc *sc = ic->ic_softc;
        struct wpi_node *wn = WPI_NODE(ni);
 
        if (wn->id != WPI_ID_UNDEFINED) {
@@ -1700,7 +1699,7 @@ wpi_recv_mgmt(struct ieee80211_node *ni,
     int rssi, int nf)
 {
        struct ieee80211vap *vap = ni->ni_vap;
-       struct wpi_softc *sc = vap->iv_ic->ic_ifp->if_softc;
+       struct wpi_softc *sc = vap->iv_ic->ic_softc;
        struct wpi_vap *wvp = WPI_VAP(vap);
        uint64_t ni_tstamp, rx_tstamp;
 
@@ -1763,8 +1762,7 @@ wpi_newstate(struct ieee80211vap *vap, e
 {
        struct wpi_vap *wvp = WPI_VAP(vap);
        struct ieee80211com *ic = vap->iv_ic;
-       struct ifnet *ifp = ic->ic_ifp;
-       struct wpi_softc *sc = ifp->if_softc;
+       struct wpi_softc *sc = ic->ic_softc;
        int error = 0;
 
        DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_BEGIN, __func__);
@@ -3037,7 +3035,7 @@ wpi_raw_xmit(struct ieee80211_node *ni, 
 {
        struct ieee80211com *ic = ni->ni_ic;
        struct ifnet *ifp = ic->ic_ifp;
-       struct wpi_softc *sc = ifp->if_softc;
+       struct wpi_softc *sc = ic->ic_softc;
        int error = 0;
 
        DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_BEGIN, __func__);
@@ -3492,7 +3490,7 @@ static int
 wpi_updateedca(struct ieee80211com *ic)
 {
 #define WPI_EXP2(x)    ((1 << (x)) - 1)        /* CWmin = 2^ECWmin - 1 */
-       struct wpi_softc *sc = ic->ic_ifp->if_softc;
+       struct wpi_softc *sc = ic->ic_softc;
        struct wpi_edca_params cmd;
        int aci, error;
 
@@ -4324,7 +4322,7 @@ wpi_config_beacon(struct wpi_vap *wvp)
        struct ieee80211com *ic = wvp->wv_vap.iv_ic;
        struct ieee80211_beacon_offsets *bo = &wvp->wv_boff;
        struct wpi_buf *bcn = &wvp->wv_bcbuf;
-       struct wpi_softc *sc = ic->ic_ifp->if_softc;
+       struct wpi_softc *sc = ic->ic_softc;
        struct wpi_cmd_beacon *cmd = (struct wpi_cmd_beacon *)&bcn->data;
        struct ieee80211_tim_ie *tie;
        struct mbuf *m;
@@ -4406,7 +4404,7 @@ wpi_setup_beacon(struct wpi_softc *sc, s
 static void
 wpi_update_beacon(struct ieee80211vap *vap, int item)
 {
-       struct wpi_softc *sc = vap->iv_ic->ic_ifp->if_softc;
+       struct wpi_softc *sc = vap->iv_ic->ic_softc;
        struct wpi_vap *wvp = WPI_VAP(vap);
        struct wpi_buf *bcn = &wvp->wv_bcbuf;
        struct ieee80211_beacon_offsets *bo = &wvp->wv_boff;
@@ -4448,7 +4446,7 @@ static void
 wpi_newassoc(struct ieee80211_node *ni, int isnew)
 {
        struct ieee80211vap *vap = ni->ni_vap;
-       struct wpi_softc *sc = ni->ni_ic->ic_ifp->if_softc;
+       struct wpi_softc *sc = ni->ni_ic->ic_softc;
        struct wpi_node *wn = WPI_NODE(ni);
        int error;
 
@@ -4575,7 +4573,7 @@ wpi_load_key(struct ieee80211_node *ni, 
 {
        const struct ieee80211_cipher *cip = k->wk_cipher;
        struct ieee80211vap *vap = ni->ni_vap;
-       struct wpi_softc *sc = ni->ni_ic->ic_ifp->if_softc;
+       struct wpi_softc *sc = ni->ni_ic->ic_softc;
        struct wpi_node *wn = WPI_NODE(ni);
        struct wpi_node_info node;
        uint16_t kflags;
@@ -4639,7 +4637,7 @@ wpi_load_key_cb(void *arg, struct ieee80
 {
        const struct ieee80211_key *k = arg;
        struct ieee80211vap *vap = ni->ni_vap;
-       struct wpi_softc *sc = ni->ni_ic->ic_ifp->if_softc;
+       struct wpi_softc *sc = ni->ni_ic->ic_softc;
        struct wpi_node *wn = WPI_NODE(ni);
        int error;
 
@@ -4674,7 +4672,7 @@ static int
 wpi_del_key(struct ieee80211_node *ni, const struct ieee80211_key *k)
 {
        struct ieee80211vap *vap = ni->ni_vap;
-       struct wpi_softc *sc = ni->ni_ic->ic_ifp->if_softc;
+       struct wpi_softc *sc = ni->ni_ic->ic_softc;
        struct wpi_node *wn = WPI_NODE(ni);
        struct wpi_node_info node;
        uint16_t kflags;
@@ -4724,7 +4722,7 @@ wpi_del_key_cb(void *arg, struct ieee802
 {
        const struct ieee80211_key *k = arg;
        struct ieee80211vap *vap = ni->ni_vap;
-       struct wpi_softc *sc = ni->ni_ic->ic_ifp->if_softc;
+       struct wpi_softc *sc = ni->ni_ic->ic_softc;
        struct wpi_node *wn = WPI_NODE(ni);
        int error;
 
@@ -4746,7 +4744,7 @@ wpi_process_key(struct ieee80211vap *vap
     int set)
 {
        struct ieee80211com *ic = vap->iv_ic;
-       struct wpi_softc *sc = ic->ic_ifp->if_softc;
+       struct wpi_softc *sc = ic->ic_softc;
        struct wpi_vap *wvp = WPI_VAP(vap);
        struct ieee80211_node *ni;
        int error, ni_ref = 0;
@@ -5544,7 +5542,7 @@ wpi_stop(struct wpi_softc *sc)
 static void
 wpi_scan_start(struct ieee80211com *ic)
 {
-       struct wpi_softc *sc = ic->ic_ifp->if_softc;
+       struct wpi_softc *sc = ic->ic_softc;
 
        wpi_set_led(sc, WPI_LED_LINK, 20, 2);
 }
@@ -5555,8 +5553,7 @@ wpi_scan_start(struct ieee80211com *ic)
 static void
 wpi_scan_end(struct ieee80211com *ic)
 {
-       struct ifnet *ifp = ic->ic_ifp;
-       struct wpi_softc *sc = ifp->if_softc;
+       struct wpi_softc *sc = ic->ic_softc;
        struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
 
        if (vap->iv_state == IEEE80211_S_RUN)
@@ -5571,8 +5568,7 @@ static void
 wpi_set_channel(struct ieee80211com *ic)
 {
        const struct ieee80211_channel *c = ic->ic_curchan;
-       struct ifnet *ifp = ic->ic_ifp;
-       struct wpi_softc *sc = ifp->if_softc;
+       struct wpi_softc *sc = ic->ic_softc;
        int error;
 
        DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_DOING, __func__);
@@ -5618,7 +5614,7 @@ wpi_scan_curchan(struct ieee80211_scan_s
 {
        struct ieee80211vap *vap = ss->ss_vap;
        struct ieee80211com *ic = vap->iv_ic;
-       struct wpi_softc *sc = ic->ic_ifp->if_softc;
+       struct wpi_softc *sc = ic->ic_softc;
        int error;
 
        WPI_RXON_LOCK(sc);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to