Page MenuHomeFreeBSD
Files F96530981

D37840.id116142.diff
No OneTemporary
Actions

D37840.id116142.diff
View Options

diff --git a/sys/dev/mwl/if_mwl.c b/sys/dev/mwl/if_mwl.c
--- a/sys/dev/mwl/if_mwl.c
+++ b/sys/dev/mwl/if_mwl.c
@@ -98,7 +98,7 @@
static int mwl_transmit(struct ieee80211com *, struct mbuf *);
static int mwl_raw_xmit(struct ieee80211_node *, struct mbuf *,
const struct ieee80211_bpf_params *);
-static int mwl_media_change(struct ifnet *);
+static int mwl_media_change(if_t);
static void mwl_watchdog(void *);
static int mwl_ioctl(struct ieee80211com *, u_long, void *);
static void mwl_radar_proc(void *, int);
@@ -1465,7 +1465,7 @@
}
static int
-mwl_media_change(struct ifnet *ifp)
+mwl_media_change(if_t ifp)
{
struct ieee80211vap *vap;
int error;
@@ -1475,7 +1475,7 @@
if (error != 0)
return (error);
- vap = ifp->if_softc;
+ vap = if_getsoftc(ifp);
mwl_setrates(vap);
return (0);
}
@@ -1735,14 +1735,14 @@
/* XXX Punt on ranges. */
if (nmc == MWL_HAL_MCAST_MAX ||
!IEEE80211_ADDR_EQ(enm->enm_addrlo, enm->enm_addrhi)) {
- ifp->if_flags |= IFF_ALLMULTI;
+ if_setflagsbit(ifp, IFF_ALLMULTI, 0);
return;
}
IEEE80211_ADDR_COPY(mp, enm->enm_addrlo);
mp += IEEE80211_ADDR_LEN, nmc++;
ETHER_NEXT_MULTI(estep, enm);
}
- ifp->if_flags &= ~IFF_ALLMULTI;
+ if_setflagsbit(ifp, 0, IFF_ALLMULTI);
mwl_hal_setmcast(sc->sc_mh, nmc, macs);
#endif
}
@@ -4088,7 +4088,7 @@
int error;
DPRINTF(sc, MWL_DEBUG_STATE, "%s: %s: %s -> %s\n",
- vap->iv_ifp->if_xname, __func__,
+ if_name(vap->iv_ifp), __func__,
ieee80211_state_name[ostate], ieee80211_state_name[nstate]);
callout_stop(&sc->sc_timer);
@@ -4150,7 +4150,7 @@
DPRINTF(sc, MWL_DEBUG_STATE,
"%s: %s(RUN): iv_flags 0x%08x bintvl %d bssid %s "
"capinfo 0x%04x chan %d\n",
- vap->iv_ifp->if_xname, __func__, vap->iv_flags,
+ if_name(vap->iv_ifp), __func__, vap->iv_flags,
ni->ni_intval, ether_sprintf(ni->ni_bssid), ni->ni_capinfo,
ieee80211_chan2ieee(ic, ic->ic_curchan));
@@ -4183,7 +4183,7 @@
break;
case IEEE80211_M_STA:
DPRINTF(sc, MWL_DEBUG_STATE, "%s: %s: aid 0x%x\n",
- vap->iv_ifp->if_xname, __func__, ni->ni_associd);
+ if_name(vap->iv_ifp), __func__, ni->ni_associd);
/*
* Set state now that we're associated.
*/
@@ -4196,7 +4196,7 @@
break;
case IEEE80211_M_WDS:
DPRINTF(sc, MWL_DEBUG_STATE, "%s: %s: bssid %s\n",
- vap->iv_ifp->if_xname, __func__,
+ if_name(vap->iv_ifp), __func__,
ether_sprintf(ni->ni_bssid));
mwl_seteapolformat(vap);
break;
@@ -4729,9 +4729,9 @@
#if 0
/* NB: embed these numbers to get a consistent view */
sc->sc_stats.mst_tx_packets =
- ifp->if_get_counter(ifp, IFCOUNTER_OPACKETS);
+ if_get_counter(ifp, IFCOUNTER_OPACKETS);
sc->sc_stats.mst_rx_packets =
- ifp->if_get_counter(ifp, IFCOUNTER_IPACKETS);
+ if_get_counter(ifp, IFCOUNTER_IPACKETS);
#endif
/*
* NB: Drop the softc lock in case of a page fault;

File Metadata

Mime Type
text/plain
Expires
Thu, Sep 26, 9:14 AM (18 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
12533758
Default Alt Text
D37840.id116142.diff (2 KB)

Event Timeline