Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 2 Oct 2023 14:54:24 GMT
From:      "Bjoern A. Zeeb" <bz@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: f156cd892b55 - main - net80211 / drivers: remove public use of ieee80211_node_incref()
Message-ID:  <202310021454.392EsOgQ035306@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=f156cd892b55c04a39fa06d1899e6e316de77f03

commit f156cd892b55c04a39fa06d1899e6e316de77f03
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2023-10-02 14:44:29 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2023-10-02 14:52:57 +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
    MFC after:      4 weeks
---
 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__);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310021454.392EsOgQ035306>