rtw patches for v6.19-rc1

Fix two regressions of rtw88 and one existing issue that TID out of range
 in rtlwifi.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEuyEnvMdOsBl1WjpdjlvZYmhshd8FAmk/zPUACgkQjlvZYmhs
 hd+ilA/8DKeqYnT1siYz1dQ+76DJ3h9AjDq4Pwy5RjGXcADPCDU7Gf5JUYVQvTNj
 rAlKRVHFlZZld2NJhS7rOBoDzaNKSFUypre8fuoZdb281MdIDUuIY86JqtLy1F6G
 MqqCf5b5lFcIq3ajs3Np0Fi+bRXgqaRSTMdOiF+YAphUjiNuQAYtUqchAXEYn8JU
 BLCcIZWOngzOt8lyU83pUNErn+CwIzsfkCF6OhZNcakHC+aeq9mrDeQe164ue1aD
 EolXdcG3pgVXCnhsKF+Jpo+g4hHrl9xZkTzoLPWvKYSWzzWEq7bd+fBVDC705xQ1
 InXKGAyQjAYrItMHzvKQAGv+YRnUo8WlMgE/oSv6eGYAVVuGNRXookW7PMhb/Il/
 FPFemJt/1oQJruid8WdqkC9lrEdH+drzCreINF7CemWPkt8DiHjrGiMySjboD7gi
 rDosE/H9LXDEuhepYJ9lMxam6tGUrj/f/oYR+aysEMCbMmNYjDMMlPF1/D60DkKP
 vXk62RulPXfSoYRKAGZZqKCI8Pw0+6ECeqKdR+c1u9U/rsozHZpBb4TOxI47HmHF
 lGnwA31pOCUQWDkjnKsiUFlilrEdQ7H+VUjKpzpqiQrk3HYyPrrgTZly8pA8EnT6
 b2XG8JC9Iw4mKxG8aAhUSgVRIj3281XekW8bFf92JUvPqJ9kKrQ=
 =vnhm
 -----END PGP SIGNATURE-----

Merge tag 'rtw-2025-12-15' of https://github.com/pkshih/rtw

Ping-Ke Shih says:
==================
rtw patches for v6.19-rc1

Fix two regressions of rtw88 and one existing issue that TID out of range
in rtlwifi.
==================

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2025-12-16 10:20:28 +01:00
commit 7623cc423e
3 changed files with 6 additions and 4 deletions

View File

@ -511,7 +511,8 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,
if (sta) {
sta_entry = (struct rtl_sta_info *)sta->drv_priv;
tid = ieee80211_get_tid(hdr);
agg_state = sta_entry->tids[tid].agg.agg_state;
if (tid < MAX_TID_COUNT)
agg_state = sta_entry->tids[tid].agg.agg_state;
ampdu_density = sta->deflink.ht_cap.ampdu_density;
}

View File

@ -144,8 +144,10 @@ static u32 rtw_sdio_to_io_address(struct rtw_dev *rtwdev, u32 addr,
static bool rtw_sdio_use_direct_io(struct rtw_dev *rtwdev, u32 addr)
{
bool might_indirect_under_power_off = rtwdev->chip->id == RTW_CHIP_TYPE_8822C;
if (!test_bit(RTW_FLAG_POWERON, rtwdev->flags) &&
!rtw_sdio_is_bus_addr(addr))
!rtw_sdio_is_bus_addr(addr) && might_indirect_under_power_off)
return false;
return !rtw_sdio_is_sdio30_supported(rtwdev) ||

View File

@ -965,8 +965,7 @@ static int rtw_usb_init_rx(struct rtw_dev *rtwdev)
struct sk_buff *rx_skb;
int i;
rtwusb->rxwq = alloc_workqueue("rtw88_usb: rx wq", WQ_BH | WQ_UNBOUND,
0);
rtwusb->rxwq = alloc_workqueue("rtw88_usb: rx wq", WQ_BH, 0);
if (!rtwusb->rxwq) {
rtw_err(rtwdev, "failed to create RX work queue\n");
return -ENOMEM;