Date: Sun, 25 May 2025 15:24:28 GMT From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 249f14c87fd5 - main - net80211: remove direct references to ifp->if_xname Message-ID: <202505251524.54PFOSae031902@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=249f14c87fd5ad232d5058db40db48c009e235c5 commit 249f14c87fd5ad232d5058db40db48c009e235c5 Author: Adrian Chadd <adrian@FreeBSD.org> AuthorDate: 2025-05-18 04:58:25 +0000 Commit: Adrian Chadd <adrian@FreeBSD.org> CommitDate: 2025-05-25 15:24:10 +0000 net80211: remove direct references to ifp->if_xname * change ieee80211_get_vap_ifname() to use if_name() * migrate the other references of ifp->if_xname to ieee80211_get_vap_ifname() Differential Revision: https://reviews.freebsd.org/D50407 Reviewed by: bz --- sys/net80211/ieee80211_freebsd.c | 2 +- sys/net80211/ieee80211_scan.c | 4 ++-- sys/net80211/ieee80211_wds.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c index d0aa47859a3a..5c7ebd7c727c 100644 --- a/sys/net80211/ieee80211_freebsd.c +++ b/sys/net80211/ieee80211_freebsd.c @@ -1141,7 +1141,7 @@ ieee80211_get_vap_ifname(struct ieee80211vap *vap) { 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 index 04fee33f48f1..02cad610ee8e 100644 --- a/sys/net80211/ieee80211_scan.c +++ b/sys/net80211/ieee80211_scan.c @@ -245,10 +245,10 @@ ieee80211_scan_update_locked(struct ieee80211vap *vap, "%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 index 0bb9271693db..98eb7f78c58d 100644 --- a/sys/net80211/ieee80211_wds.c +++ b/sys/net80211/ieee80211_wds.c @@ -169,7 +169,7 @@ ieee80211_create_wds(struct ieee80211vap *vap, struct ieee80211_channel *chan) 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 { /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505251524.54PFOSae031902>