git: 357d45eefc9b - stable/13 - net80211 / drivers: remove public use of ieee80211_node_incref()
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 29 Nov 2023 16:38:40 UTC
The branch stable/13 has been updated by bz:
URL: https://cgit.FreeBSD.org/src/commit/?id=357d45eefc9b0ab6c30afb5a364ab0cb66b905c1
commit 357d45eefc9b0ab6c30afb5a364ab0cb66b905c1
Author: Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2023-10-02 14:44:29 +0000
Commit: Bjoern A. Zeeb <bz@FreeBSD.org>
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__);