From nobody Mon Feb 6 17:53:58 2023 X-Original-To: dev-commits-src-all@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 4P9Ym66F8Cz3n0Tj; Mon, 6 Feb 2023 17:53:58 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P9Ym65m2Pz4XHR; Mon, 6 Feb 2023 17:53:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675706038; 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=OhHRO1hjMIK9UXRttYgzD6CJrWCxpfr2w5kn22PnmGQ=; b=ZXt4Otexmubx+cxcHS9mNIbdNBBaWxqGDmMKHrzCyZvSNjpI6dJbYwlf2Kp7dP0ljqm4bG 2nLPbWIHP+HgUmJfpabU+DdSMsb33e3l5coWa2gWLWIb1DzZn6ziQ85/tY4BEEN+Ryt2/C Nlcqn1dcj2eyXGq8UBVA1kvNm3ihDZjwOtluzYQZtW1Zsa06DRO3ijoDmVWL3BvjWAZyIe mOXQQEp7cCD+dHoKPhWHLwFu26M2Y+1WXRJ6bD5dACVvVy/9cxjf6JsWX+48H7dxdx6+R1 S6cAhiAAc3H2gIVFBTvZDfpB1Kf1y9z0+V927c2zACTzvHMRIdkVzOImHmptqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675706038; 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=OhHRO1hjMIK9UXRttYgzD6CJrWCxpfr2w5kn22PnmGQ=; b=WfCzH5UVRBev6kArHORs4M9HNZDIdSs2vjlxZxKELXsUzyA7qfGNsqg23SkvySY7leH8OQ 7E0KFPcOYZ5tQ32euH9DvaK5pnq+VQQEA6y/ddOfQWo9NzLuZCIZRuYcv8SnsOSF9Y0FA/ QQJTRRXa/ZbhGonT++rSnWMqSG8cZAYUKahXhEq++eeuNn6vOBeQfz/lh5b1H+H6nKMHpa 1i0vAOHQkrQm93ogjxutx+CAROaEmtJD0IB72cfDd2F49gpLBsvJnKrKDo367iui+1V/dN ZHSaAXPsVsX9jEFJ8iNPSaJYQ0iGOMUjlXdcnP8TUzmxuWTvQrQXvm0TTbw1uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675706038; a=rsa-sha256; cv=none; b=k/YAm++YQGiVl3MLOYM3nCXtdVwXgciZlEeL46X9D1mauJqTB/Lt3TU8jq6HS3+jU4nw5S dTq02uAnI8IuUmdfIQCeaDVcdxNC0GaeLdSmTkz7jj7zRj/VFljE9NtdQz1hA0BfHSq9wr uBY9n5xnC829XIHgOMwaONylv3jh1t/oxe7s+YcsGntPRN1fRjBcNBGDm2QxjF3a2D3oFZ vMp0vv04NMgI1l2CVgDycevzpvHZrY91tRe2JsVzZFdN48LTgXzIIOPMhD6JJC/SsDoLPj H2Bsh6EnNs60s6m76vSZir/UM9YiZH2yze0TtngWtsMoVr97qf9n5vszj1bIqg== 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 4P9Ym64ZmQzkjS; Mon, 6 Feb 2023 17:53:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 316Hrwid074267; Mon, 6 Feb 2023 17:53:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316HrwHm074266; Mon, 6 Feb 2023 17:53:58 GMT (envelope-from git) Date: Mon, 6 Feb 2023 17:53:58 GMT Message-Id: <202302061753.316HrwHm074266@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 76614fdc8c7b - main - Mechanically convert iwi(4) and iwn(4) to IfAPI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76614fdc8c7b1a1a6f35471c91a247a91d70500c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=76614fdc8c7b1a1a6f35471c91a247a91d70500c commit 76614fdc8c7b1a1a6f35471c91a247a91d70500c Author: Justin Hibbits AuthorDate: 2022-09-19 20:47:17 +0000 Commit: Justin Hibbits CommitDate: 2023-02-06 17:32:05 +0000 Mechanically convert iwi(4) and iwn(4) to IfAPI Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D37849 --- sys/dev/iwi/if_iwi.c | 10 +++++----- sys/dev/iwn/if_iwn.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/dev/iwi/if_iwi.c b/sys/dev/iwi/if_iwi.c index 8cd27091d2d9..7456f43a2259 100644 --- a/sys/dev/iwi/if_iwi.c +++ b/sys/dev/iwi/if_iwi.c @@ -160,7 +160,7 @@ static void iwi_free_rx_ring(struct iwi_softc *, struct iwi_rx_ring *); 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 @@ iwi_cvtrate(int iwirate) * 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 @@ static int 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 @@ iwi_auth_and_assoc(struct iwi_softc *sc, struct ieee80211vap *vap) 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 index 13a0f03f88a0..8795032fc3ae 100644 --- a/sys/dev/iwn/if_iwn.c +++ b/sys/dev/iwn/if_iwn.c @@ -7152,9 +7152,9 @@ iwn_scan(struct iwn_softc *sc, struct ieee80211vap *vap, 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 */