From nobody Wed Oct 04 15:23:48 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 4S0z446LWlz4w6hb; Wed, 4 Oct 2023 15:23:48 +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 4S0z4459QXz4N7k; Wed, 4 Oct 2023 15:23:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696433028; 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=TvcVcLH6dVp7+ffpTcZ4WW0eQX+ru0Xdlt7B2+HSJQI=; b=DDe3QEIVP+WOhBuGg77vqJy84wKLYiwgn66luZ2NIzcpi629IWoAZ49HSzP4b75RdyyKAz zCjv7Oimd/7y6agg4KX8IZeeCwZ3lNQPAXXfDok4MC8cFhQEf4aMwgtnpl9mDBVH7VGvLA 6ZuLPJOfbyJvsJSRvYnM/J48QPcw56k15IP50NznHUGOUgM34PI93jEH8CHPDeg1W9CZCl TIzQRt+CNqhvjSVeLJcFs6xs+LFl9Fh3T9ZsyJnO1X0f+FoRSqE5J6QXcVKjjA8BIe40jH 3V4D9mziEWpwRYrRvAPgcw01qclXJ7/vsHJewAubm47cOGj8K3tuoXEaDg7m5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696433028; a=rsa-sha256; cv=none; b=GINE3ylkQJjg3Ptx7nleChhngCh8Pf7FAur6pBw6Hx1Z7EZh7aBng5WD4dnoGCPjTsKyex XolSCXkFrDrmKfxFCmIXsQeXKTQPdkdFWf1v/mhhBf2yb4FaTmVlkS8ulAnvGvbVYFOzLM mTZ/2K8iNcXgceVFY67RQ8/oZOaJR8zGhIs0a9R3GcpWtFTisWTF0mRFENg1lPep7+XyCk 07aM2yBcZFLnzdB7vnmhYwZ3ZO+75y9VC94T2yXa7jkGZ0RRw2VwhWal2DrWh4QAf5MZZM BQH+4VnxIoVCUCj8AQs3agMHExCJkdrsn1CQGL/jb/UWS25rGJg+LZVe/dbavQ== 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=1696433028; 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=TvcVcLH6dVp7+ffpTcZ4WW0eQX+ru0Xdlt7B2+HSJQI=; b=DINxSaN4uuttyWAuw/vxggqoMFWi6gzy7YP4MxGN+kWP1KOF/SCT34+3/Sez4DmAZTXILI xYLLB+udk1o8kpPimffyoGv2MW3KY/F5En4AHUeWFhBF6KB39xibkPM2Ou2e+2dC16mjU7 RgcWjNJMQzdF25zL0fZ189jHLCpTGk0g/1zaGWZDHgQmdrCllVr6HyS/Vk0UBamjQcN/fV l4r6W2V1ziexcWzjOa4MLi+69LXGR2t6ezKvwe/oI/OQbqCxuv420fUEFSxZbFsHFrd0pU RWyakM2TUsd5PUT2l96yUqrIJCqo8y6q9WD406anrwbQXK0zo40rAljYxbt+ZQ== 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 4S0z444G62zjdR; Wed, 4 Oct 2023 15:23:48 +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 394FNmqQ087129; Wed, 4 Oct 2023 15:23:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394FNmu6087126; Wed, 4 Oct 2023 15:23:48 GMT (envelope-from git) Date: Wed, 4 Oct 2023 15:23:48 GMT Message-Id: <202310041523.394FNmu6087126@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 493d6255434c - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 493d6255434ce70ea99b1ccdbea5c88169013bd2 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=493d6255434ce70ea99b1ccdbea5c88169013bd2 commit 493d6255434ce70ea99b1ccdbea5c88169013bd2 Author: Bjoern A. Zeeb AuthorDate: 2023-10-02 14:44:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-10-04 15:19:18 +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 (cherry picked from commit f156cd892b55c04a39fa06d1899e6e316de77f03) --- 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__);