Page MenuHomeFreeBSD

D50407.id155996.diff
No OneTemporary

D50407.id155996.diff

diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c
--- a/sys/net80211/ieee80211_freebsd.c
+++ b/sys/net80211/ieee80211_freebsd.c
@@ -1141,7 +1141,7 @@
{
if (vap->iv_ifp == NULL)
return "(none)";
- return vap->iv_ifp->if_xname;
+ return (if_name(vap->iv_ifp));
}
#ifdef DEBUGNET
diff --git a/sys/net80211/ieee80211_scan.c b/sys/net80211/ieee80211_scan.c
--- a/sys/net80211/ieee80211_scan.c
+++ b/sys/net80211/ieee80211_scan.c
@@ -245,10 +245,10 @@
"%s: current scanner is <%s:%s>, switch to <%s:%s>\n",
__func__,
ss->ss_vap != NULL ?
- ss->ss_vap->iv_ifp->if_xname : "none",
+ ieee80211_get_vap_ifname(ss->ss_vap) : "none",
ss->ss_vap != NULL ?
ieee80211_opmode_name[ss->ss_vap->iv_opmode] : "none",
- vap->iv_ifp->if_xname,
+ ieee80211_get_vap_ifname(vap),
ieee80211_opmode_name[vap->iv_opmode]);
}
#endif
diff --git a/sys/net80211/ieee80211_wds.c b/sys/net80211/ieee80211_wds.c
--- a/sys/net80211/ieee80211_wds.c
+++ b/sys/net80211/ieee80211_wds.c
@@ -169,7 +169,7 @@
IEEE80211_DPRINTF(vap, IEEE80211_MSG_WDS,
"%s: station %s in use with %s\n",
__func__, ether_sprintf(vap->iv_des_bssid),
- ni->ni_wdsvap->iv_ifp->if_xname);
+ ieee80211_get_vap_ifname(ni->ni_wdsvap));
/* XXX stat? */
} else {
/*

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 13, 1:47 AM (9 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26917944
Default Alt Text
D50407.id155996.diff (1 KB)

Event Timeline