git: dff11c4f8007 - main - rtwn: enable seqno offload; migrate to use ieee80211_output_seqno_assign()

The branch main has been updated by adrian:

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

commit dff11c4f8007841484748af08e11e110c541fd7d
Author:     Adrian Chadd <adrian@FreeBSD.org>
AuthorDate: 2025-06-05 00:47:14 +0000
Commit:     Adrian Chadd <adrian@FreeBSD.org>
CommitDate: 2025-09-06 06:15:47 +0000

    rtwn: enable seqno offload; migrate to use ieee80211_output_seqno_assign()
    
    This should both enable the sequence number offloading and disable
    the net80211 TX lock from being acquired/released/checked.
    
    Locally tested:
    
    * RTL8812AU, STA mode
    
    Reviewed by: bz
    Differential Revision:  https://reviews.freebsd.org/D52301
    Differential Revision:  https://reviews.freebsd.org/D50693
---
 sys/dev/rtwn/if_rtwn.c          |  3 +++
 sys/dev/rtwn/if_rtwn_tx.c       |  8 ++++++++
 sys/dev/rtwn/rtl8192c/r92c_tx.c | 11 +++++------
 sys/dev/rtwn/rtl8812a/r12a_tx.c | 12 ++++--------
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/sys/dev/rtwn/if_rtwn.c b/sys/dev/rtwn/if_rtwn.c
index 7a547e13cafa..25287f222270 100644
--- a/sys/dev/rtwn/if_rtwn.c
+++ b/sys/dev/rtwn/if_rtwn.c
@@ -268,6 +268,9 @@ rtwn_attach(struct rtwn_softc *sc)
 	ic->ic_flags_ext |= IEEE80211_FEXT_WATCHDOG;
 #endif
 
+	/* Enable seqno offload */
+	ic->ic_flags_ext |= IEEE80211_FEXT_SEQNO_OFFLOAD;
+
 	/* Adjust capabilities. */
 	rtwn_adj_devcaps(sc);
 
diff --git a/sys/dev/rtwn/if_rtwn_tx.c b/sys/dev/rtwn/if_rtwn_tx.c
index 2c9c246dfbb4..fa7f35f2de83 100644
--- a/sys/dev/rtwn/if_rtwn_tx.c
+++ b/sys/dev/rtwn/if_rtwn_tx.c
@@ -183,6 +183,10 @@ rtwn_tx_data(struct rtwn_softc *sc, struct ieee80211_node *ni,
 		}
 	}
 
+	/* seqno allocate, only if AMPDU isn't running */
+	if ((m->m_flags & M_AMPDU_MPDU) == 0)
+		ieee80211_output_seqno_assign(ni, -1, m);
+
 	cipher = IEEE80211_CIPHER_NONE;
 	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 		k = ieee80211_crypto_encap(ni, m);
@@ -229,6 +233,10 @@ rtwn_tx_raw(struct rtwn_softc *sc, struct ieee80211_node *ni,
 	uint8_t type;
 	u_int cipher;
 
+	/* seqno allocate, only if AMPDU isn't running */
+	if ((m->m_flags & M_AMPDU_MPDU) == 0)
+		ieee80211_output_seqno_assign(ni, -1, m);
+
 	/* Encrypt the frame if need be. */
 	cipher = IEEE80211_CIPHER_NONE;
 	if (params->ibp_flags & IEEE80211_BPF_CRYPTO) {
diff --git a/sys/dev/rtwn/rtl8192c/r92c_tx.c b/sys/dev/rtwn/rtl8192c/r92c_tx.c
index 6b013de0c536..ba2f60bd9295 100644
--- a/sys/dev/rtwn/rtl8192c/r92c_tx.c
+++ b/sys/dev/rtwn/rtl8192c/r92c_tx.c
@@ -452,11 +452,10 @@ r92c_fill_tx_desc(struct rtwn_softc *sc, struct ieee80211_node *ni,
 	} else {
 		uint16_t seqno;
 
-		if (m->m_flags & M_AMPDU_MPDU) {
-			seqno = ni->ni_txseqs[tid] % IEEE80211_SEQ_RANGE;
-			ni->ni_txseqs[tid]++;
-		} else
-			seqno = M_SEQNO_GET(m) % IEEE80211_SEQ_RANGE;
+		if (m->m_flags & M_AMPDU_MPDU)
+			ieee80211_output_seqno_assign(ni, -1, m);
+
+		seqno = M_SEQNO_GET(m);
 
 		/* Set sequence number. */
 		txd->txdseq = htole16(seqno);
@@ -511,7 +510,7 @@ r92c_fill_tx_desc_raw(struct rtwn_softc *sc, struct ieee80211_node *ni,
 		rtwn_r92c_tx_setup_hwseq(sc, txd);
 	} else {
 		/* Set sequence number. */
-		txd->txdseq |= htole16(M_SEQNO_GET(m) % IEEE80211_SEQ_RANGE);
+		txd->txdseq |= htole16(M_SEQNO_GET(m));
 	}
 }
 
diff --git a/sys/dev/rtwn/rtl8812a/r12a_tx.c b/sys/dev/rtwn/rtl8812a/r12a_tx.c
index 0ca1ebd37757..6a7af0a9b674 100644
--- a/sys/dev/rtwn/rtl8812a/r12a_tx.c
+++ b/sys/dev/rtwn/rtl8812a/r12a_tx.c
@@ -433,12 +433,9 @@ r12a_fill_tx_desc(struct rtwn_softc *sc, struct ieee80211_node *ni,
 	} else {
 		uint16_t seqno;
 
-		if (m->m_flags & M_AMPDU_MPDU) {
-			seqno = ni->ni_txseqs[tid];
-			ni->ni_txseqs[tid]++;
-		} else
-			seqno = M_SEQNO_GET(m) % IEEE80211_SEQ_RANGE;
-
+		if (m->m_flags & M_AMPDU_MPDU)
+			ieee80211_output_seqno_assign(ni, -1, m);
+		seqno = M_SEQNO_GET(m);
 		/* Set sequence number. */
 		txd->txdw9 |= htole32(SM(R12A_TXDW9_SEQ, seqno));
 	}
@@ -493,8 +490,7 @@ r12a_fill_tx_desc_raw(struct rtwn_softc *sc, struct ieee80211_node *ni,
 		txd->txdw3 |= htole32(SM(R12A_TXDW3_SEQ_SEL, uvp->id));
 	} else {
 		/* Set sequence number. */
-		txd->txdw9 |= htole32(SM(R12A_TXDW9_SEQ,
-		    M_SEQNO_GET(m) % IEEE80211_SEQ_RANGE));
+		txd->txdw9 |= htole32(SM(R12A_TXDW9_SEQ, M_SEQNO_GET(m)));
 	}
 }