Further conversions from ifp->if_softc -> ic_softc.
This commit is contained in:
parent
3843c5e486
commit
d3fdd08cf3
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=286950
@ -509,8 +509,7 @@ static void
|
||||
rsu_scan_start(struct ieee80211com *ic)
|
||||
{
|
||||
int error;
|
||||
struct ifnet *ifp = ic->ic_ifp;
|
||||
struct rsu_softc *sc = ifp->if_softc;
|
||||
struct rsu_softc *sc = ic->ic_softc;
|
||||
|
||||
/* Scanning is done by the firmware. */
|
||||
RSU_LOCK(sc);
|
||||
@ -935,7 +934,7 @@ rsu_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
|
||||
{
|
||||
struct rsu_vap *uvp = RSU_VAP(vap);
|
||||
struct ieee80211com *ic = vap->iv_ic;
|
||||
struct rsu_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct rsu_softc *sc = ic->ic_softc;
|
||||
struct ieee80211_node *ni;
|
||||
struct ieee80211_rateset *rs;
|
||||
enum ieee80211_state ostate;
|
||||
@ -1819,6 +1818,7 @@ static int
|
||||
rsu_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
|
||||
{
|
||||
struct ieee80211com *ic = ifp->if_l2com;
|
||||
struct rsu_softc *sc = ic->ic_softc;
|
||||
struct ifreq *ifr = (struct ifreq *) data;
|
||||
int error = 0, startall = 0;
|
||||
|
||||
@ -1826,7 +1826,7 @@ rsu_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
|
||||
case SIOCSIFFLAGS:
|
||||
if (ifp->if_flags & IFF_UP) {
|
||||
if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) {
|
||||
rsu_init(ifp->if_softc);
|
||||
rsu_init(sc);
|
||||
startall = 1;
|
||||
}
|
||||
} else {
|
||||
@ -2297,7 +2297,7 @@ rsu_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
|
||||
{
|
||||
struct ieee80211com *ic = ni->ni_ic;
|
||||
struct ifnet *ifp = ic->ic_ifp;
|
||||
struct rsu_softc *sc = ifp->if_softc;
|
||||
struct rsu_softc *sc = ic->ic_softc;
|
||||
struct rsu_data *bf;
|
||||
|
||||
/* prevent management frames from being sent if we're not ready */
|
||||
|
@ -595,7 +595,7 @@ rum_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit,
|
||||
const uint8_t bssid[IEEE80211_ADDR_LEN],
|
||||
const uint8_t mac[IEEE80211_ADDR_LEN])
|
||||
{
|
||||
struct rum_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct rum_softc *sc = ic->ic_softc;
|
||||
struct rum_vap *rvp;
|
||||
struct ieee80211vap *vap;
|
||||
|
||||
@ -711,7 +711,7 @@ rum_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
|
||||
{
|
||||
struct rum_vap *rvp = RUM_VAP(vap);
|
||||
struct ieee80211com *ic = vap->iv_ic;
|
||||
struct rum_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct rum_softc *sc = ic->ic_softc;
|
||||
const struct ieee80211_txparam *tp;
|
||||
enum ieee80211_state ostate;
|
||||
struct ieee80211_node *ni;
|
||||
@ -1333,8 +1333,8 @@ rum_start(struct ifnet *ifp)
|
||||
static int
|
||||
rum_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
|
||||
{
|
||||
struct rum_softc *sc = ifp->if_softc;
|
||||
struct ieee80211com *ic = ifp->if_l2com;
|
||||
struct rum_softc *sc = ic->ic_softc;
|
||||
struct ifreq *ifr = (struct ifreq *) data;
|
||||
int error;
|
||||
int startall = 0;
|
||||
@ -1786,8 +1786,8 @@ rum_enable_tsf(struct rum_softc *sc)
|
||||
static void
|
||||
rum_update_slot(struct ifnet *ifp)
|
||||
{
|
||||
struct rum_softc *sc = ifp->if_softc;
|
||||
struct ieee80211com *ic = ifp->if_l2com;
|
||||
struct rum_softc *sc = ic->ic_softc;
|
||||
uint8_t slottime;
|
||||
uint32_t tmp;
|
||||
|
||||
@ -2189,7 +2189,7 @@ rum_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
|
||||
const struct ieee80211_bpf_params *params)
|
||||
{
|
||||
struct ifnet *ifp = ni->ni_ic->ic_ifp;
|
||||
struct rum_softc *sc = ifp->if_softc;
|
||||
struct rum_softc *sc = ni->ni_ic->ic_softc;
|
||||
|
||||
RUM_LOCK(sc);
|
||||
/* prevent management frames from being sent if we're not ready */
|
||||
@ -2263,7 +2263,7 @@ rum_ratectl_task(void *arg, int pending)
|
||||
struct ieee80211vap *vap = &rvp->vap;
|
||||
struct ieee80211com *ic = vap->iv_ic;
|
||||
struct ifnet *ifp = ic->ic_ifp;
|
||||
struct rum_softc *sc = ifp->if_softc;
|
||||
struct rum_softc *sc = ic->ic_softc;
|
||||
struct ieee80211_node *ni;
|
||||
int ok, fail;
|
||||
int sum, retrycnt;
|
||||
@ -2293,7 +2293,7 @@ static void
|
||||
rum_scan_start(struct ieee80211com *ic)
|
||||
{
|
||||
struct ifnet *ifp = ic->ic_ifp;
|
||||
struct rum_softc *sc = ifp->if_softc;
|
||||
struct rum_softc *sc = ic->ic_softc;
|
||||
uint32_t tmp;
|
||||
|
||||
RUM_LOCK(sc);
|
||||
@ -2308,7 +2308,7 @@ rum_scan_start(struct ieee80211com *ic)
|
||||
static void
|
||||
rum_scan_end(struct ieee80211com *ic)
|
||||
{
|
||||
struct rum_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct rum_softc *sc = ic->ic_softc;
|
||||
|
||||
RUM_LOCK(sc);
|
||||
rum_enable_tsf_sync(sc);
|
||||
@ -2320,7 +2320,7 @@ rum_scan_end(struct ieee80211com *ic)
|
||||
static void
|
||||
rum_set_channel(struct ieee80211com *ic)
|
||||
{
|
||||
struct rum_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct rum_softc *sc = ic->ic_softc;
|
||||
|
||||
RUM_LOCK(sc);
|
||||
rum_set_chan(sc, ic->ic_curchan);
|
||||
|
@ -894,7 +894,7 @@ run_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit,
|
||||
const uint8_t mac[IEEE80211_ADDR_LEN])
|
||||
{
|
||||
struct ifnet *ifp = ic->ic_ifp;
|
||||
struct run_softc *sc = ifp->if_softc;
|
||||
struct run_softc *sc = ic->ic_softc;
|
||||
struct run_vap *rvp;
|
||||
struct ieee80211vap *vap;
|
||||
int i;
|
||||
@ -1005,8 +1005,7 @@ run_vap_delete(struct ieee80211vap *vap)
|
||||
|
||||
ic = vap->iv_ic;
|
||||
ifp = ic->ic_ifp;
|
||||
|
||||
sc = ifp->if_softc;
|
||||
sc = ic->ic_softc;
|
||||
|
||||
RUN_LOCK(sc);
|
||||
|
||||
@ -2002,7 +2001,7 @@ run_media_change(struct ifnet *ifp)
|
||||
struct ieee80211vap *vap = ifp->if_softc;
|
||||
struct ieee80211com *ic = vap->iv_ic;
|
||||
const struct ieee80211_txparam *tp;
|
||||
struct run_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct run_softc *sc = ic->ic_softc;
|
||||
uint8_t rate, ridx;
|
||||
int error;
|
||||
|
||||
@ -2048,7 +2047,7 @@ run_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
|
||||
{
|
||||
const struct ieee80211_txparam *tp;
|
||||
struct ieee80211com *ic = vap->iv_ic;
|
||||
struct run_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct run_softc *sc = ic->ic_softc;
|
||||
struct run_vap *rvp = RUN_VAP(vap);
|
||||
enum ieee80211_state ostate;
|
||||
uint32_t sta[3];
|
||||
@ -2181,7 +2180,7 @@ static void
|
||||
run_wme_update_cb(void *arg)
|
||||
{
|
||||
struct ieee80211com *ic = arg;
|
||||
struct run_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct run_softc *sc = ic->ic_softc;
|
||||
struct ieee80211_wme_state *wmesp = &ic->ic_wme;
|
||||
int aci, error = 0;
|
||||
|
||||
@ -2234,7 +2233,7 @@ run_wme_update_cb(void *arg)
|
||||
static int
|
||||
run_wme_update(struct ieee80211com *ic)
|
||||
{
|
||||
struct run_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct run_softc *sc = ic->ic_softc;
|
||||
|
||||
/* sometime called wothout lock */
|
||||
if (mtx_owned(&ic->ic_comlock.mtx)) {
|
||||
@ -2277,7 +2276,7 @@ run_key_set_cb(void *arg)
|
||||
struct ieee80211vap *vap = cmdq->arg1;
|
||||
struct ieee80211_key *k = cmdq->k;
|
||||
struct ieee80211com *ic = vap->iv_ic;
|
||||
struct run_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct run_softc *sc = ic->ic_softc;
|
||||
struct ieee80211_node *ni;
|
||||
uint32_t attr;
|
||||
uint16_t base, associd;
|
||||
@ -2399,7 +2398,7 @@ run_key_set(struct ieee80211vap *vap, struct ieee80211_key *k,
|
||||
const uint8_t mac[IEEE80211_ADDR_LEN])
|
||||
{
|
||||
struct ieee80211com *ic = vap->iv_ic;
|
||||
struct run_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct run_softc *sc = ic->ic_softc;
|
||||
uint32_t i;
|
||||
|
||||
i = RUN_CMDQ_GET(&sc->cmdq_store);
|
||||
@ -2467,7 +2466,7 @@ static int
|
||||
run_key_delete(struct ieee80211vap *vap, struct ieee80211_key *k)
|
||||
{
|
||||
struct ieee80211com *ic = vap->iv_ic;
|
||||
struct run_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct run_softc *sc = ic->ic_softc;
|
||||
struct ieee80211_key *k0;
|
||||
uint32_t i;
|
||||
|
||||
@ -2661,7 +2660,7 @@ run_newassoc_cb(void *arg)
|
||||
{
|
||||
struct run_cmdq *cmdq = arg;
|
||||
struct ieee80211_node *ni = cmdq->arg1;
|
||||
struct run_softc *sc = ni->ni_vap->iv_ic->ic_ifp->if_softc;
|
||||
struct run_softc *sc = ni->ni_vap->iv_ic->ic_softc;
|
||||
uint8_t wcid = cmdq->wcid;
|
||||
|
||||
RUN_LOCK_ASSERT(sc, MA_OWNED);
|
||||
@ -2679,7 +2678,7 @@ run_newassoc(struct ieee80211_node *ni, int isnew)
|
||||
struct ieee80211_rateset *rs = &ni->ni_rates;
|
||||
struct ieee80211vap *vap = ni->ni_vap;
|
||||
struct ieee80211com *ic = vap->iv_ic;
|
||||
struct run_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct run_softc *sc = ic->ic_softc;
|
||||
uint8_t rate;
|
||||
uint8_t ridx;
|
||||
uint8_t wcid;
|
||||
@ -3692,7 +3691,7 @@ run_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
|
||||
const struct ieee80211_bpf_params *params)
|
||||
{
|
||||
struct ifnet *ifp = ni->ni_ic->ic_ifp;
|
||||
struct run_softc *sc = ifp->if_softc;
|
||||
struct run_softc *sc = ni->ni_ic->ic_softc;
|
||||
int error = 0;
|
||||
|
||||
RUN_LOCK(sc);
|
||||
@ -3767,8 +3766,8 @@ run_start(struct ifnet *ifp)
|
||||
static int
|
||||
run_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
|
||||
{
|
||||
struct run_softc *sc = ifp->if_softc;
|
||||
struct ieee80211com *ic = sc->sc_ifp->if_l2com;
|
||||
struct ieee80211com *ic = ifp->if_l2com;
|
||||
struct run_softc *sc = ic->ic_softc;
|
||||
struct ifreq *ifr = (struct ifreq *) data;
|
||||
int startall = 0;
|
||||
int error;
|
||||
@ -4841,7 +4840,7 @@ run_set_chan(struct run_softc *sc, struct ieee80211_channel *c)
|
||||
static void
|
||||
run_set_channel(struct ieee80211com *ic)
|
||||
{
|
||||
struct run_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct run_softc *sc = ic->ic_softc;
|
||||
|
||||
RUN_LOCK(sc);
|
||||
run_set_chan(sc, ic->ic_curchan);
|
||||
@ -4853,7 +4852,7 @@ run_set_channel(struct ieee80211com *ic)
|
||||
static void
|
||||
run_scan_start(struct ieee80211com *ic)
|
||||
{
|
||||
struct run_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct run_softc *sc = ic->ic_softc;
|
||||
uint32_t tmp;
|
||||
|
||||
RUN_LOCK(sc);
|
||||
@ -4873,7 +4872,7 @@ run_scan_start(struct ieee80211com *ic)
|
||||
static void
|
||||
run_scan_end(struct ieee80211com *ic)
|
||||
{
|
||||
struct run_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct run_softc *sc = ic->ic_softc;
|
||||
|
||||
RUN_LOCK(sc);
|
||||
|
||||
@ -4894,7 +4893,7 @@ static void
|
||||
run_update_beacon(struct ieee80211vap *vap, int item)
|
||||
{
|
||||
struct ieee80211com *ic = vap->iv_ic;
|
||||
struct run_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct run_softc *sc = ic->ic_softc;
|
||||
struct run_vap *rvp = RUN_VAP(vap);
|
||||
int mcast = 0;
|
||||
uint32_t i;
|
||||
@ -4939,7 +4938,7 @@ run_update_beacon_cb(void *arg)
|
||||
struct ieee80211vap *vap = arg;
|
||||
struct run_vap *rvp = RUN_VAP(vap);
|
||||
struct ieee80211com *ic = vap->iv_ic;
|
||||
struct run_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct run_softc *sc = ic->ic_softc;
|
||||
struct rt2860_txwi txwi;
|
||||
struct mbuf *m;
|
||||
uint16_t txwisize;
|
||||
@ -4987,7 +4986,7 @@ run_update_beacon_cb(void *arg)
|
||||
static void
|
||||
run_updateprot(struct ieee80211com *ic)
|
||||
{
|
||||
struct run_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct run_softc *sc = ic->ic_softc;
|
||||
uint32_t i;
|
||||
|
||||
i = RUN_CMDQ_GET(&sc->cmdq_store);
|
||||
@ -5001,7 +5000,7 @@ static void
|
||||
run_updateprot_cb(void *arg)
|
||||
{
|
||||
struct ieee80211com *ic = arg;
|
||||
struct run_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct run_softc *sc = ic->ic_softc;
|
||||
uint32_t tmp;
|
||||
|
||||
tmp = RT2860_RTSTH_EN | RT2860_PROT_NAV_SHORT | RT2860_TXOP_ALLOW_ALL;
|
||||
@ -5025,7 +5024,7 @@ static void
|
||||
run_usb_timeout_cb(void *arg)
|
||||
{
|
||||
struct ieee80211vap *vap = arg;
|
||||
struct run_softc *sc = vap->iv_ic->ic_ifp->if_softc;
|
||||
struct run_softc *sc = vap->iv_ic->ic_softc;
|
||||
|
||||
RUN_LOCK_ASSERT(sc, MA_OWNED);
|
||||
|
||||
@ -5231,8 +5230,8 @@ static void
|
||||
run_updateslot_cb(void *arg)
|
||||
{
|
||||
struct ifnet *ifp = arg;
|
||||
struct run_softc *sc = ifp->if_softc;
|
||||
struct ieee80211com *ic = ifp->if_l2com;
|
||||
struct run_softc *sc = ic->ic_softc;
|
||||
uint32_t tmp;
|
||||
|
||||
run_read(sc, RT2860_BKOFF_SLOT_CFG, &tmp);
|
||||
|
@ -1559,7 +1559,7 @@ uath_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
|
||||
{
|
||||
struct ieee80211com *ic = ifp->if_l2com;
|
||||
struct ifreq *ifr = (struct ifreq *) data;
|
||||
struct uath_softc *sc = ifp->if_softc;
|
||||
struct uath_softc *sc = ic->ic_softc;
|
||||
int error;
|
||||
int startall = 0;
|
||||
|
||||
@ -1573,7 +1573,7 @@ uath_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
|
||||
case SIOCSIFFLAGS:
|
||||
if (ifp->if_flags & IFF_UP) {
|
||||
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) {
|
||||
uath_init(ifp->if_softc);
|
||||
uath_init(sc);
|
||||
startall = 1;
|
||||
}
|
||||
} else {
|
||||
@ -1857,7 +1857,7 @@ uath_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
|
||||
struct ieee80211com *ic = ni->ni_ic;
|
||||
struct ifnet *ifp = ic->ic_ifp;
|
||||
struct uath_data *bf;
|
||||
struct uath_softc *sc = ifp->if_softc;
|
||||
struct uath_softc *sc = ic->ic_softc;
|
||||
|
||||
/* prevent management frames from being sent if we're not ready */
|
||||
if ((sc->sc_flags & UATH_FLAG_INVALID) ||
|
||||
@ -1908,7 +1908,7 @@ static void
|
||||
uath_set_channel(struct ieee80211com *ic)
|
||||
{
|
||||
struct ifnet *ifp = ic->ic_ifp;
|
||||
struct uath_softc *sc = ifp->if_softc;
|
||||
struct uath_softc *sc = ic->ic_softc;
|
||||
|
||||
UATH_LOCK(sc);
|
||||
if ((sc->sc_flags & UATH_FLAG_INVALID) ||
|
||||
@ -2075,7 +2075,7 @@ uath_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
|
||||
int error;
|
||||
struct ieee80211_node *ni;
|
||||
struct ieee80211com *ic = vap->iv_ic;
|
||||
struct uath_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct uath_softc *sc = ic->ic_softc;
|
||||
struct uath_vap *uvp = UATH_VAP(vap);
|
||||
|
||||
DPRINTF(sc, UATH_DEBUG_STATE,
|
||||
|
@ -765,8 +765,7 @@ upgt_set_macfilter(struct upgt_softc *sc, uint8_t state)
|
||||
static void
|
||||
upgt_setup_rates(struct ieee80211vap *vap, struct ieee80211com *ic)
|
||||
{
|
||||
struct ifnet *ifp = ic->ic_ifp;
|
||||
struct upgt_softc *sc = ifp->if_softc;
|
||||
struct upgt_softc *sc = vap->iv_ic->ic_softc;
|
||||
const struct ieee80211_txparam *tp;
|
||||
|
||||
/*
|
||||
@ -870,7 +869,7 @@ upgt_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
|
||||
{
|
||||
struct ieee80211com *ic = ni->ni_ic;
|
||||
struct ifnet *ifp = ic->ic_ifp;
|
||||
struct upgt_softc *sc = ifp->if_softc;
|
||||
struct upgt_softc *sc = ic->ic_softc;
|
||||
struct upgt_data *data_tx = NULL;
|
||||
|
||||
/* prevent management frames from being sent if we're not ready */
|
||||
@ -950,7 +949,7 @@ upgt_scan_end(struct ieee80211com *ic)
|
||||
static void
|
||||
upgt_set_channel(struct ieee80211com *ic)
|
||||
{
|
||||
struct upgt_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct upgt_softc *sc = ic->ic_softc;
|
||||
|
||||
UPGT_LOCK(sc);
|
||||
upgt_set_chan(sc, ic->ic_curchan);
|
||||
@ -1069,7 +1068,7 @@ upgt_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
|
||||
{
|
||||
struct upgt_vap *uvp = UPGT_VAP(vap);
|
||||
struct ieee80211com *ic = vap->iv_ic;
|
||||
struct upgt_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct upgt_softc *sc = ic->ic_softc;
|
||||
|
||||
/* do it in a process context */
|
||||
sc->sc_state = nstate;
|
||||
|
@ -580,7 +580,7 @@ ural_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit,
|
||||
const uint8_t bssid[IEEE80211_ADDR_LEN],
|
||||
const uint8_t mac[IEEE80211_ADDR_LEN])
|
||||
{
|
||||
struct ural_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct ural_softc *sc = ic->ic_softc;
|
||||
struct ural_vap *uvp;
|
||||
struct ieee80211vap *vap;
|
||||
|
||||
@ -697,7 +697,7 @@ ural_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
|
||||
{
|
||||
struct ural_vap *uvp = URAL_VAP(vap);
|
||||
struct ieee80211com *ic = vap->iv_ic;
|
||||
struct ural_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct ural_softc *sc = ic->ic_softc;
|
||||
const struct ieee80211_txparam *tp;
|
||||
struct ieee80211_node *ni;
|
||||
struct mbuf *m;
|
||||
@ -1615,7 +1615,7 @@ static void
|
||||
ural_scan_start(struct ieee80211com *ic)
|
||||
{
|
||||
struct ifnet *ifp = ic->ic_ifp;
|
||||
struct ural_softc *sc = ifp->if_softc;
|
||||
struct ural_softc *sc = ic->ic_softc;
|
||||
|
||||
RAL_LOCK(sc);
|
||||
ural_write(sc, RAL_TXRX_CSR19, 0);
|
||||
@ -1626,7 +1626,7 @@ ural_scan_start(struct ieee80211com *ic)
|
||||
static void
|
||||
ural_scan_end(struct ieee80211com *ic)
|
||||
{
|
||||
struct ural_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct ural_softc *sc = ic->ic_softc;
|
||||
|
||||
RAL_LOCK(sc);
|
||||
ural_enable_tsf_sync(sc);
|
||||
@ -1638,7 +1638,7 @@ ural_scan_end(struct ieee80211com *ic)
|
||||
static void
|
||||
ural_set_channel(struct ieee80211com *ic)
|
||||
{
|
||||
struct ural_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct ural_softc *sc = ic->ic_softc;
|
||||
|
||||
RAL_LOCK(sc);
|
||||
ural_set_chan(sc, ic->ic_curchan);
|
||||
@ -1819,8 +1819,8 @@ ural_enable_tsf(struct ural_softc *sc)
|
||||
static void
|
||||
ural_update_slot(struct ifnet *ifp)
|
||||
{
|
||||
struct ural_softc *sc = ifp->if_softc;
|
||||
struct ieee80211com *ic = ifp->if_l2com;
|
||||
struct ural_softc *sc = ic->ic_softc;
|
||||
uint16_t slottime, sifs, eifs;
|
||||
|
||||
slottime = (ic->ic_flags & IEEE80211_F_SHSLOT) ? 9 : 20;
|
||||
@ -2194,7 +2194,7 @@ ural_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
|
||||
{
|
||||
struct ieee80211com *ic = ni->ni_ic;
|
||||
struct ifnet *ifp = ic->ic_ifp;
|
||||
struct ural_softc *sc = ifp->if_softc;
|
||||
struct ural_softc *sc = ic->ic_softc;
|
||||
|
||||
RAL_LOCK(sc);
|
||||
/* prevent management frames from being sent if we're not ready */
|
||||
@ -2267,7 +2267,7 @@ ural_ratectl_task(void *arg, int pending)
|
||||
struct ieee80211vap *vap = &uvp->vap;
|
||||
struct ieee80211com *ic = vap->iv_ic;
|
||||
struct ifnet *ifp = ic->ic_ifp;
|
||||
struct ural_softc *sc = ifp->if_softc;
|
||||
struct ural_softc *sc = ic->ic_softc;
|
||||
struct ieee80211_node *ni;
|
||||
int ok, fail;
|
||||
int sum, retrycnt;
|
||||
|
@ -1404,8 +1404,8 @@ urtw_abort_xfers(struct urtw_softc *sc)
|
||||
static int
|
||||
urtw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
|
||||
{
|
||||
struct urtw_softc *sc = ifp->if_softc;
|
||||
struct ieee80211com *ic = ifp->if_l2com;
|
||||
struct urtw_softc *sc = ic->ic_softc;
|
||||
struct ifreq *ifr = (struct ifreq *) data;
|
||||
int error;
|
||||
int startall = 0;
|
||||
@ -1424,7 +1424,7 @@ urtw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
|
||||
(IFF_ALLMULTI | IFF_PROMISC))
|
||||
urtw_set_multi(sc);
|
||||
} else {
|
||||
urtw_init(ifp->if_softc);
|
||||
urtw_init(sc);
|
||||
startall = 1;
|
||||
}
|
||||
} else {
|
||||
@ -1567,7 +1567,7 @@ urtw_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
|
||||
struct ieee80211com *ic = ni->ni_ic;
|
||||
struct ifnet *ifp = ic->ic_ifp;
|
||||
struct urtw_data *bf;
|
||||
struct urtw_softc *sc = ifp->if_softc;
|
||||
struct urtw_softc *sc = ic->ic_softc;
|
||||
|
||||
/* prevent management frames from being sent if we're not ready */
|
||||
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) {
|
||||
@ -1615,7 +1615,7 @@ urtw_scan_end(struct ieee80211com *ic)
|
||||
static void
|
||||
urtw_set_channel(struct ieee80211com *ic)
|
||||
{
|
||||
struct urtw_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct urtw_softc *sc = ic->ic_softc;
|
||||
struct ifnet *ifp = sc->sc_ifp;
|
||||
uint32_t data, orig;
|
||||
usb_error_t error;
|
||||
@ -1862,7 +1862,7 @@ static int
|
||||
urtw_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
|
||||
{
|
||||
struct ieee80211com *ic = vap->iv_ic;
|
||||
struct urtw_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct urtw_softc *sc = ic->ic_softc;
|
||||
struct urtw_vap *uvp = URTW_VAP(vap);
|
||||
struct ieee80211_node *ni;
|
||||
usb_error_t error = 0;
|
||||
|
@ -593,7 +593,7 @@ zyd_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
|
||||
{
|
||||
struct zyd_vap *zvp = ZYD_VAP(vap);
|
||||
struct ieee80211com *ic = vap->iv_ic;
|
||||
struct zyd_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct zyd_softc *sc = ic->ic_softc;
|
||||
int error;
|
||||
|
||||
DPRINTF(sc, ZYD_DEBUG_STATE, "%s: %s -> %s\n", __func__,
|
||||
@ -2623,7 +2623,7 @@ zyd_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
|
||||
{
|
||||
struct ieee80211com *ic = ni->ni_ic;
|
||||
struct ifnet *ifp = ic->ic_ifp;
|
||||
struct zyd_softc *sc = ifp->if_softc;
|
||||
struct zyd_softc *sc = ic->ic_softc;
|
||||
|
||||
ZYD_LOCK(sc);
|
||||
/* prevent management frames from being sent if we're not ready */
|
||||
@ -2659,8 +2659,8 @@ zyd_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
|
||||
static int
|
||||
zyd_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
|
||||
{
|
||||
struct zyd_softc *sc = ifp->if_softc;
|
||||
struct ieee80211com *ic = ifp->if_l2com;
|
||||
struct zyd_softc *sc = ic->ic_softc;
|
||||
struct ifreq *ifr = (struct ifreq *) data;
|
||||
int error;
|
||||
int startall = 0;
|
||||
@ -2926,7 +2926,7 @@ static void
|
||||
zyd_scan_start(struct ieee80211com *ic)
|
||||
{
|
||||
struct ifnet *ifp = ic->ic_ifp;
|
||||
struct zyd_softc *sc = ifp->if_softc;
|
||||
struct zyd_softc *sc = ic->ic_softc;
|
||||
|
||||
ZYD_LOCK(sc);
|
||||
/* want broadcast address while scanning */
|
||||
@ -2937,7 +2937,7 @@ zyd_scan_start(struct ieee80211com *ic)
|
||||
static void
|
||||
zyd_scan_end(struct ieee80211com *ic)
|
||||
{
|
||||
struct zyd_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct zyd_softc *sc = ic->ic_softc;
|
||||
|
||||
ZYD_LOCK(sc);
|
||||
/* restore previous bssid */
|
||||
@ -2948,7 +2948,7 @@ zyd_scan_end(struct ieee80211com *ic)
|
||||
static void
|
||||
zyd_set_channel(struct ieee80211com *ic)
|
||||
{
|
||||
struct zyd_softc *sc = ic->ic_ifp->if_softc;
|
||||
struct zyd_softc *sc = ic->ic_softc;
|
||||
|
||||
ZYD_LOCK(sc);
|
||||
zyd_set_chan(sc, ic->ic_curchan);
|
||||
|
Loading…
Reference in New Issue
Block a user