From nobody Thu Oct 05 14:30:25 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 4S1Yr159xSz4wrMF; Thu, 5 Oct 2023 14:30:25 +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 4S1Yr14hgvz4QB9; Thu, 5 Oct 2023 14:30:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696516225; 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=/tWPIbTgs+tCzlMe3zHPqrvYErgHUIy0ULedQUOBuOE=; b=cnbXm2NMn1bhXYe8miVTy/5NyvfR32ChZudRjo1J8zVqURUt5JcDJaq8AZiociiqNk2tAr n9TQpDEBTcpSpE3ubsW1GWC0844MfHW+muXBMYvsgXJvSi96UHn5ThRI1FSbb54gbq/tXS DNWENFVsVsyxAMzdw0FmPZvONKKdx5W+qcLTrlScvF//HBKsJ7z20eCrzvEGl+rX6Pw0XV YlanZL9E/yL/MSC9EakmDcUrXlHGFbD0LFThBnjgjbmbHy0DikvRb3jXL8JSzRefPq1jzI KSDM2a9zsvyRYg7nD8IbJxlqCWLZrqzzx9VKxXgZTbE5qvHgRqYwFNk5PmFQDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696516225; a=rsa-sha256; cv=none; b=Ujjl/yZP6H6B7rlU6qTpslGUtdC9M/jTLHd+zUzeldAfXcFQKbPnHUAulT/kxE0Eohw43i LL/cM2ipRvBTaAaHhATpJxE28+6N9wF9Ls5nTyZ+W9KorWqwt9tqT6b1AyRiI3HsFDbVtc 2dzLKs1fhgaXRv0+Av7l1zbjNMkYGmzFdLAOoa8HE6bnzmociZa9A63E6KsVkxYv5l4jt5 grwOsGcGkSEI0z6Uez0nZQQYBcqfk0YkAl2lVtWpfhHo22/SqNKqN32dZjJgdjvqnRZF5X CMzYgP8AoXDYvTXonKgYEPzSRRRm9o05FqTDAf637jaUlten1yMUtmtQEoEJ+w== 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=1696516225; 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=/tWPIbTgs+tCzlMe3zHPqrvYErgHUIy0ULedQUOBuOE=; b=MrCJsn4rn02MJQrzHdkkX99fjq3gZE2uMU3tHCe8pjUkwmXd2JIrjpKxijNor58zyhVRoY 5wmKUkMJ7Z1Ym5+BjT7Q+LVCA/my/TwiA4bHhilWg6kjYewuJbQiSQaaoRjI8qV2Pdk5f8 ioSgYYjP8pBVlxRiOK89n66aoYZA+d4qq+Hzc2Gq+EzyDGDyvgT7eayENViT2UhGC4q7Z8 Tlyl/s0Boci78djSbbYkckCFZb9YISCpstE8EgyOkS6Qg/66YUlNAwQ1lVgZM+kLuTATGo Rt6l9F4TDv8kapEcIkvCFOXWbaKPcifZWuSkQ+wvHxHPM8X3FW3QhjE2NvhsIQ== 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 4S1Yr13lFHz1NNf; Thu, 5 Oct 2023 14:30:25 +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 395EUPsO003827; Thu, 5 Oct 2023 14:30:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 395EUPxd003824; Thu, 5 Oct 2023 14:30:25 GMT (envelope-from git) Date: Thu, 5 Oct 2023 14:30:25 GMT Message-Id: <202310051430.395EUPxd003824@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: 1137943b1c5b - main - net80211: remove ieee80211_unref_node() 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: 1137943b1c5b225e30b82350ff7fb12c258ea90f Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1137943b1c5b225e30b82350ff7fb12c258ea90f commit 1137943b1c5b225e30b82350ff7fb12c258ea90f Author: Bjoern A. Zeeb AuthorDate: 2023-10-02 14:30:46 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-10-05 14:28:55 +0000 net80211: remove ieee80211_unref_node() ieee80211_unref_node() was only used in two error cases in ieee80211_send_nulldata(). There we do not need to guard against ni pointer reuse after decrementing the refcount of the ni as we only update the stats and return. Update the man page and remove the link for the now gone function. Sponsored by: The FreeBSD Foundation X-MFC: never Reviewed by: adrian, emaste Differential Revision: https://reviews.freebsd.org/D42035 --- ObsoleteFiles.inc | 3 +++ share/man/man9/Makefile | 3 +-- share/man/man9/ieee80211_node.9 | 15 ++++----------- sys/net80211/ieee80211_node.h | 7 ------- sys/net80211/ieee80211_output.c | 4 ++-- 5 files changed, 10 insertions(+), 22 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 09e18daa7abf..c3cc72351963 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20231005: Remove man page link for now gone net80211 function. +OLD_FILES+=usr/share/man/man9/ieee80211_unref_node.9.gz + # 20231005: bsdconfig remove support for floppy and ftp OLD_FILES+=usr/share/bsdconfig/media/floppy.subr OLD_FILES+=usr/share/bsdconfig/media/ftp.subr diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 1e38eaf8adae..0b56a47db332 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1212,8 +1212,7 @@ MLINKS+=ieee80211_node.9 ieee80211_dump_node.9 \ ieee80211_node.9 ieee80211_find_rxnode_withkey.9 \ ieee80211_node.9 ieee80211_free_node.9 \ ieee80211_node.9 ieee80211_iterate_nodes.9 \ - ieee80211_node.9 ieee80211_ref_node.9 \ - ieee80211_node.9 ieee80211_unref_node.9 + ieee80211_node.9 ieee80211_ref_node.9 MLINKS+=ieee80211_output.9 ieee80211_process_callback.9 \ ieee80211_output.9 M_SEQNO_GET.9 \ ieee80211_output.9 M_WME_GETAC.9 diff --git a/share/man/man9/ieee80211_node.9 b/share/man/man9/ieee80211_node.9 index 8340b4762b67..6dd492e3b33d 100644 --- a/share/man/man9/ieee80211_node.9 +++ b/share/man/man9/ieee80211_node.9 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 28, 2010 +.Dd October 2, 2023 .Dt IEEE80211_NODE 9 .Os .Sh NAME @@ -50,9 +50,6 @@ .Fn ieee80211_ref_node "struct ieee80211_node *" .\" .Ft void -.Fn ieee80211_unref_node "struct ieee80211_node *" -.\" -.Ft void .Fn ieee80211_free_node "struct ieee80211_node *" .\" .Ft void @@ -106,14 +103,10 @@ Routines that lookup a table entry return a (i.e. a pointer to a table entry with the reference count incremented). The .Fn ieee80211_ref_node -and -.Fn ieee80211_unref_node -calls explicitly increment/decrement the reference count of a node, -but are rarely used. -Instead most callers use +call explicitly increments the reference count of a node. .Fn ieee80211_free_node -to release a reference and, if the count goes to zero, reclaim the -table entry. +decrements the reference count of a node and if the count goes to zero +reclaims the table entry. .Pp The station table and its entries are exposed to drivers in several ways. Each frame transmitted to a station includes a reference to the diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h index 826ecccb1238..685df28ed519 100644 --- a/sys/net80211/ieee80211_node.h +++ b/sys/net80211/ieee80211_node.h @@ -326,13 +326,6 @@ ieee80211_ref_node(struct ieee80211_node *ni) return ni; } -static __inline void -ieee80211_unref_node(struct ieee80211_node **ni) -{ - ieee80211_node_decref(*ni); - *ni = NULL; /* guard against use */ -} - void ieee80211_node_attach(struct ieee80211com *); void ieee80211_node_lateattach(struct ieee80211com *); void ieee80211_node_detach(struct ieee80211com *); diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index 2358ba009e13..a02073ae8d9c 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -1104,7 +1104,7 @@ ieee80211_send_nulldata(struct ieee80211_node *ni) if (vap->iv_state == IEEE80211_S_CAC) { IEEE80211_NOTE(vap, IEEE80211_MSG_OUTPUT | IEEE80211_MSG_DOTH, ni, "block %s frame in CAC state", "null data"); - ieee80211_unref_node(&ni); + ieee80211_node_decref(ni); vap->iv_stats.is_tx_badstate++; return EIO; /* XXX */ } @@ -1122,7 +1122,7 @@ ieee80211_send_nulldata(struct ieee80211_node *ni) m = ieee80211_getmgtframe(&frm, ic->ic_headroom + hdrlen, 0); if (m == NULL) { /* XXX debug msg */ - ieee80211_unref_node(&ni); + ieee80211_node_decref(ni); vap->iv_stats.is_tx_nobuf++; return ENOMEM; }