Page MenuHomeFreeBSD
Files F157027433

D42035.diff
No OneTemporary
Actions

D42035.diff
View Options

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20231002: Remove man page link for now gone net80211 function.
+OLD_FILES+=usr/share/man/man9/ieee80211_unref_node.9.gz
+
# 20230927: Man pages renamed to match the actual functions
OLD_FILES+=usr/share/man/man9/cr_seeothergids.9.gz
OLD_FILES+=usr/share/man/man9/cr_seeotheruids.9.gz
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1212,8 +1212,7 @@
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
--- 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 @@
(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
--- a/sys/net80211/ieee80211_node.h
+++ b/sys/net80211/ieee80211_node.h
@@ -326,13 +326,6 @@
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
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -1104,7 +1104,7 @@
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 @@
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;
}

File Metadata

Mime Type
text/plain
Expires
Tue, May 19, 12:48 AM (18 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33280784
Default Alt Text
D42035.diff (3 KB)

Event Timeline