Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 21 Jun 2021 08:06:37 GMT
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 7544c1d20d8b - main - rtwn: make sure to not write in upper bits of txdseq
Message-ID:  <202106210806.15L86buZ049865@gitrepo.freebsd.org>

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

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

commit 7544c1d20d8b7127ed3511edeb94e01d328daebb
Author:     Andriy Gapon <avg@FreeBSD.org>
AuthorDate: 2021-06-21 08:05:04 +0000
Commit:     Andriy Gapon <avg@FreeBSD.org>
CommitDate: 2021-06-21 08:05:04 +0000

    rtwn: make sure to not write in upper bits of txdseq
    
    ni_txseqs is kept as 16-bit counter, but we need to trim the upper four
    bits as they may have special meanings for the firmware / hardware.
    For instance, bit 15 enables hardware / firmware generation of sequence
    numbers that overrides sequence numbers programmed by the driver.
    
    Reviewed by:    adrian
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D30814
---
 sys/dev/rtwn/rtl8192c/r92c_tx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/rtwn/rtl8192c/r92c_tx.c b/sys/dev/rtwn/rtl8192c/r92c_tx.c
index ab2d05635358..b01731ba29ed 100644
--- a/sys/dev/rtwn/rtl8192c/r92c_tx.c
+++ b/sys/dev/rtwn/rtl8192c/r92c_tx.c
@@ -335,7 +335,7 @@ r92c_fill_tx_desc(struct rtwn_softc *sc, struct ieee80211_node *ni,
 		uint16_t seqno;
 
 		if (m->m_flags & M_AMPDU_MPDU) {
-			seqno = ni->ni_txseqs[tid];
+			seqno = ni->ni_txseqs[tid] % IEEE80211_SEQ_RANGE;
 			ni->ni_txseqs[tid]++;
 		} else
 			seqno = M_SEQNO_GET(m) % IEEE80211_SEQ_RANGE;



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