From nobody Sun May 25 15:24:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b52kP2tn0z5xg1s; Sun, 25 May 2025 15:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b52kN75jSz3tqD; Sun, 25 May 2025 15:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748186669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=avZ4awH42imDlCuYy0UZP0l8PnIRmu9jvbDvKFeJq+I=; b=iBq1wD3bRBrEtPVRt5hn7FLt7kzyDs7HMI1g3Qfbg3oNwuiyINPy7bj+m2eqofP1+DZouH xQ763vcQ0+BPQ0JL2m4ZjaxDiPOY5XCNPsU2B5E+BFCsucS763S3k70Zfi5J30VAEVOFdQ 3sQlSzI4wQyKt+5aSc7EbhAkss5q3p1PeeuNaOP4VNQSFYNKNE52+LlOc+/SSqNGmtBOeS PMCpawmBqOkwQFSL1DeJbceMlpr1xzST+cbdrejfEAYspeRNQkPzeiLYy/7vqvASuiikpo 7Pw24XST0AczKsRrx61E8MZz9KjkK2ucb0xXUTfZMoy+Npec2duNFwlXBDeQNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748186669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=avZ4awH42imDlCuYy0UZP0l8PnIRmu9jvbDvKFeJq+I=; b=T4HHufZHJRPMwp15bp2YFJkTWc3NkiGIBcd9NDsKN2XePwL/wxtpTd10BYxgBRvq8iner/ uv49mmusQoGmBYkUJKNcChxyXSVbUAtDxyxjtLSI4kMFmzE4mBIJnv0GHh3VwveOFvJjJT iH8hpIvsiJpGvTyB6Z/nRFYpmGjdR4hx2O5WHQXa/+CwT+SKmpzmFDQG4Pjtm2rMRCRB5Y uQp39TyqQqdhQZiS98NlDD3xfRLTbgDl7xSueIUm1PyWnl//zoZ1WSC0f2ycN0gJN/cjV7 jTfhs0Jo2+2V15N5NARwH951ABpptYk1cJ3TIt8fsN5g4ksIIg7fQ+cVFeoj6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748186669; a=rsa-sha256; cv=none; b=umrSg6VsLjg2GBmccho2OYRU6xHUTz/9CaDtuuKDkxgLN6W8/+XajH4yVSbWR5d61LKFmm niPYOm2mgbPxenpPAc9vq7UOCEShV76heCQ7hBg8MByStHEySvvt27E9cPybbJ4EM4+HFf cHAY1ujdawe4j9UDP80nUg/80y3aFN08/mccV3zIKagkLdZM/gQbNmacSf14hQfFs8L+Ow 3A+0QhOdHd87SYOkwZGQkmG7q0hGCLQ6hLaqpgZhgyzHrApPXYUG5WV3nB82iZhOXz8EIj 2s4LnN7HWcgvDwRcXogeXhLmBwguZjxgAEyDsj2rtqy3KFX5BeK7W4+0chulTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b52kN6j26zC6D; Sun, 25 May 2025 15:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54PFOSDf031905; Sun, 25 May 2025 15:24:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54PFOSae031902; Sun, 25 May 2025 15:24:28 GMT (envelope-from git) Date: Sun, 25 May 2025 15:24:28 GMT Message-Id: <202505251524.54PFOSae031902@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 249f14c87fd5 - main - net80211: remove direct references to ifp->if_xname List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 249f14c87fd5ad232d5058db40db48c009e235c5 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=249f14c87fd5ad232d5058db40db48c009e235c5 commit 249f14c87fd5ad232d5058db40db48c009e235c5 Author: Adrian Chadd AuthorDate: 2025-05-18 04:58:25 +0000 Commit: Adrian Chadd 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 { /*