From nobody Mon Oct 2 14:54:24 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 4RzkW435V9z4w9G4; Mon, 2 Oct 2023 14:54:24 +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 4RzkW42VlFz3g7l; Mon, 2 Oct 2023 14:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696258464; 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=cNecSndGzZ0H/Uo9dQXUGp7dBF1X2G3gcZUsinT5GOw=; b=VaGfXaFTengEKBpH2qidzRrwoYcEfmqFgeeYtPwRbThR8l0aKDjFo+SrFwPzLr/IMKlgL+ +deQIhHW2iL+aOUJ1iGtopMMpFX1bWEJvw6XgWPTeyBVGJDpAPpUXnNFYF11Jbdn1meGm+ DkZPK8xSu+RAm/usIE15dBvvTWp5BBIL4EiKgkCse5YSci3ssq4KzKwSHn3//05mmD0+Lc ZSj6Zcx3yvCOQVrCUTbEhyT13Tk26yZ2DuGK0efAymorag1aOCkHUKeAAwTbTg9rkcKMPU 3+bn7kmTNPvIIQk7hh6QiVrG8CNi3FhkU7JJpk0ZNM2OnL61klZPbWjXsfAUaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696258464; a=rsa-sha256; cv=none; b=XMu+I5Ffkm55ZDDu/dkefw/agdY7CDyp2b/NxvdDL0MynX5+w9slMKmdVj5DE6JgWQLLDA E51iNgHjTrh+syZNzRhHtrLqZwnVpu4EuKNyqqCTrDWbkSnSTEKOXtW7Ao5sQXbyMUOQzc pjWpEgN3LxGJXB2Q6UX3SVGqWGuXkcW0JruY6dVCzvRaOOb9zhT6xKwX3X3sTdAwsInl1K NMQbquEW4Wz1SaM553/9GuAAQkfXwzJGjDWRndXFn1cgbyO529KuUilN8XIKIjTAvJoj2Z U/QJZAneGCpRemHdXIm6cryLcQrUZCciOwD/9egl0UEZqzoP2EI3KltmrgGFtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696258464; 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=cNecSndGzZ0H/Uo9dQXUGp7dBF1X2G3gcZUsinT5GOw=; b=gjlb51obDv9d9Mmuunzxi3TxW5G+PQuOxMI2/e5RDkh2C6wAl0sKOAZqXSoMNqyo4DzIFm T7ETqyeQJOB8y4YCqsGHgJAy3iYjEWsUmfR6Y4q7gwOjdQxGxn8/q8welShKtSjIX7v3kU Q2RBpJRr5sTTqJCz+TDWeADiTdleLmfdSzsXSTkcpCMcLtif1YBAtB2YaT7rvtir1/50iy NJsXTo6+czjl2DvH61tXij1mIvzhMeRalXo0ycvVm/SYCVhyUeTuPbvJGhub69FAZTB4oi rW40q+NDzDUT9TewUvXu+5np1ew1fdufAjWHHheDxoIE0wOVsj3Jnqs+PBSb+Q== 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 4RzkW41FGfz1wZ; Mon, 2 Oct 2023 14:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 392EsOIU035309; Mon, 2 Oct 2023 14:54:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 392EsOgQ035306; Mon, 2 Oct 2023 14:54:24 GMT (envelope-from git) Date: Mon, 2 Oct 2023 14:54:24 GMT Message-Id: <202310021454.392EsOgQ035306@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: f156cd892b55 - main - net80211 / drivers: remove public use of ieee80211_node_incref() 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f156cd892b55c04a39fa06d1899e6e316de77f03 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f156cd892b55c04a39fa06d1899e6e316de77f03 commit f156cd892b55c04a39fa06d1899e6e316de77f03 Author: Bjoern A. Zeeb AuthorDate: 2023-10-02 14:44:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-10-02 14:52:57 +0000 net80211 / drivers: remove public use of ieee80211_node_incref() ieee80211_node_incref() is the FreeBSD implementation of ieee80211_ref_node(). Not being interested in the node returned it was used as a shortcut in 3 drivers (ath, uath, wpi). Replace the call with the public KPI of ieee80211_ref_node() and ignore the result. This leaves us with the single internal call going ieee80211_ref_node() -> ieee80211_node_incref() and that should help increasing portability but also limiting the places to trace for node reference operations. Sponsored by: The FreeBSD Foundation MFC after: 4 weeks --- sys/dev/ath/if_ath_tx.c | 2 +- sys/dev/usb/wlan/if_uath.c | 2 +- sys/dev/wpi/if_wpi.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/ath/if_ath_tx.c b/sys/dev/ath/if_ath_tx.c index 1fd3adef738e..69d0b5c00848 100644 --- a/sys/dev/ath/if_ath_tx.c +++ b/sys/dev/ath/if_ath_tx.c @@ -288,7 +288,7 @@ ath_txfrag_setup(struct ath_softc *sc, ath_bufhead *frags, ath_txfrag_cleanup(sc, frags, ni); break; } - ieee80211_node_incref(ni); + (void) ieee80211_ref_node(ni); TAILQ_INSERT_TAIL(frags, bf, bf_list); } ATH_TXBUF_UNLOCK(sc); diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c index 378dd717a3eb..04190821d9b9 100644 --- a/sys/dev/usb/wlan/if_uath.c +++ b/sys/dev/usb/wlan/if_uath.c @@ -1657,7 +1657,7 @@ uath_txfrag_setup(struct uath_softc *sc, uath_datahead *frags, uath_txfrag_cleanup(sc, frags, ni); break; } - ieee80211_node_incref(ni); + (void) ieee80211_ref_node(ni); STAILQ_INSERT_TAIL(frags, bf, next); } diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c index c9c2a8f6854e..5ceb037803b8 100644 --- a/sys/dev/wpi/if_wpi.c +++ b/sys/dev/wpi/if_wpi.c @@ -2768,7 +2768,7 @@ wpi_cmd2(struct wpi_softc *sc, struct wpi_buf *buf) ring->pending = 0; sc->sc_update_tx_ring(sc, ring); } else - ieee80211_node_incref(data->ni); + (void) ieee80211_ref_node(data->ni); end: DPRINTF(sc, WPI_DEBUG_TRACE, error ? TRACE_STR_END_ERR : TRACE_STR_END, __func__);