From nobody Wed Nov 29 16:38:40 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 4SgQ4d1BXjz52xF6; Wed, 29 Nov 2023 16:38:41 +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 4SgQ4d0JDgz3KS0; Wed, 29 Nov 2023 16:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275921; 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=kOjZqi/akpekDhCbMVirN/ogG9a4cg1yNQC8opHiiV8=; b=P8XXMtBgaZZILI5xAzhaKRoKzsis+5BdF6xlpTsGCgkksme034tBTqE2uA/QGKEhEPh1pH 1V1IHaMNPZT4kz3KApMl4Dp9PxKgBqrH10cdp8arUWqwowQwThTzMLNQZx84vSdWmu3QTJ g880euxWvl6C+STGUMS8OYR31GerbWuPAsFDE/QwA3yWSn+Xe0or4Wxk/SDCPmycYonz/b DykHEs09u3cDxxJW2vxMvW0DviSUauPCqYJt8Bp1cprHydljngKCsomvqcs9vXrXMK3w7Z LeXtDim+peDxZkgMo6b/qhtOdxQAoTZDMv6+XuHDxxNCOhk17E6Twd2ZNe/3Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275921; 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=kOjZqi/akpekDhCbMVirN/ogG9a4cg1yNQC8opHiiV8=; b=jt+n9enHk3i7gxZitjn3wSqOm5PnYHbLzT5gCiM2myuYKC2yEWhhVsIS/qavV8AN7jHd1m wLutTiU3VUgp0o912x5rDezpR8UEOX+Vf3mRND7JTTfOcj5CL351K0lawkv8ljGcPNoGuJ YiWRB4WPeEV6scKmfa+m3ktgek7XeMwmKeSebvu7fw0TzzO/C+S0daae6B9VFGlcJTBoeF qmM7Yr67siAlTcjsT0aho+fUxukc7Afk2zcqKSq6209UquSkVI9My1QPx2cXSz7eoCv+MF 6+3NQktSBaHz/Aagi51Uv9b9FhDr22v87Wa+l1C01qsDrau4tY7TJJmEqTW2nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275921; a=rsa-sha256; cv=none; b=Ex6GIIbrlN/8WjknDdDdWiTbhD6wmCdJR3xeB7iftRKU2CutM+JLnfTKIrUpfR9uUK9NY/ AoAtotYABgs9VCtsF9igX02t0HZJwwUYkGuClUDiv+XQKAHjK49F6yrUx4odT/ceNzMOJQ UCeLIIxgs26YFUddJ7A4R7UQMx+MkmPk6dsvGHvPdmJHGzDyOWu9J1CPaVyKJ9CdkDjk7V 0CitVIykRkmua5o5RfM5NH7jXoW4qdEVd3/Cdo4+1x2/o5++A4RpI8imaBYqa/2BcekHs9 wsz2yhYU9hhTkeIhY18BXceUhLpovRzqWHIGrsrSubPiZDt9BbNuq1Dq4Dy8Yg== 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 4SgQ4c6LZSz1CXr; Wed, 29 Nov 2023 16:38:40 +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 3ATGceQa046498; Wed, 29 Nov 2023 16:38:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcecH046495; Wed, 29 Nov 2023 16:38:40 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:40 GMT Message-Id: <202311291638.3ATGcecH046495@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: 357d45eefc9b - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 357d45eefc9b0ab6c30afb5a364ab0cb66b905c1 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=357d45eefc9b0ab6c30afb5a364ab0cb66b905c1 commit 357d45eefc9b0ab6c30afb5a364ab0cb66b905c1 Author: Bjoern A. Zeeb AuthorDate: 2023-10-02 14:44:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:10 +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 be9354bbe41a..86c7eb6b2bdd 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 bbff34ffc61e..93c5bf0a60fd 100644 --- a/sys/dev/wpi/if_wpi.c +++ b/sys/dev/wpi/if_wpi.c @@ -2769,7 +2769,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__);