Page MenuHomeFreeBSD
Files F109366053

D37849.diff
No OneTemporary
Actions

D37849.diff
View Options

diff --git a/sys/dev/iwi/if_iwi.c b/sys/dev/iwi/if_iwi.c
--- a/sys/dev/iwi/if_iwi.c
+++ b/sys/dev/iwi/if_iwi.c
@@ -160,7 +160,7 @@
static struct ieee80211_node *iwi_node_alloc(struct ieee80211vap *,
const uint8_t [IEEE80211_ADDR_LEN]);
static void iwi_node_free(struct ieee80211_node *);
-static void iwi_media_status(struct ifnet *, struct ifmediareq *);
+static void iwi_media_status(if_t, struct ifmediareq *);
static int iwi_newstate(struct ieee80211vap *, enum ieee80211_state, int);
static void iwi_wme_init(struct iwi_softc *);
static int iwi_wme_setparams(struct iwi_softc *);
@@ -920,9 +920,9 @@
* value here.
*/
static void
-iwi_media_status(struct ifnet *ifp, struct ifmediareq *imr)
+iwi_media_status(if_t ifp, struct ifmediareq *imr)
{
- struct ieee80211vap *vap = ifp->if_softc;
+ struct ieee80211vap *vap = if_getsoftc(ifp);
struct ieee80211com *ic = vap->iv_ic;
struct iwi_softc *sc = ic->ic_softc;
struct ieee80211_node *ni;
@@ -2825,7 +2825,7 @@
iwi_auth_and_assoc(struct iwi_softc *sc, struct ieee80211vap *vap)
{
struct ieee80211com *ic = vap->iv_ic;
- struct ifnet *ifp = vap->iv_ifp;
+ if_t ifp = vap->iv_ifp;
struct ieee80211_node *ni;
struct iwi_configuration config;
struct iwi_associate *assoc = &sc->assoc;
@@ -2972,7 +2972,7 @@
assoc->intval = htole16(ni->ni_intval);
IEEE80211_ADDR_COPY(assoc->bssid, ni->ni_bssid);
if (vap->iv_opmode == IEEE80211_M_IBSS)
- IEEE80211_ADDR_COPY(assoc->dst, ifp->if_broadcastaddr);
+ IEEE80211_ADDR_COPY(assoc->dst, if_getbroadcastaddr(ifp));
else
IEEE80211_ADDR_COPY(assoc->dst, ni->ni_bssid);
diff --git a/sys/dev/iwn/if_iwn.c b/sys/dev/iwn/if_iwn.c
--- a/sys/dev/iwn/if_iwn.c
+++ b/sys/dev/iwn/if_iwn.c
@@ -7152,9 +7152,9 @@
wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | IEEE80211_FC0_TYPE_MGT |
IEEE80211_FC0_SUBTYPE_PROBE_REQ;
wh->i_fc[1] = IEEE80211_FC1_DIR_NODS;
- IEEE80211_ADDR_COPY(wh->i_addr1, vap->iv_ifp->if_broadcastaddr);
- IEEE80211_ADDR_COPY(wh->i_addr2, IF_LLADDR(vap->iv_ifp));
- IEEE80211_ADDR_COPY(wh->i_addr3, vap->iv_ifp->if_broadcastaddr);
+ IEEE80211_ADDR_COPY(wh->i_addr1, if_getbroadcastaddr(vap->iv_ifp));
+ IEEE80211_ADDR_COPY(wh->i_addr2, if_getlladdr(vap->iv_ifp));
+ IEEE80211_ADDR_COPY(wh->i_addr3, if_getbroadcastaddr(vap->iv_ifp));
*(uint16_t *)&wh->i_dur[0] = 0; /* filled by HW */
*(uint16_t *)&wh->i_seq[0] = 0; /* filled by HW */

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 5, 3:14 AM (21 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16465954
Default Alt Text
D37849.diff (2 KB)

Event Timeline