Skip to content

Commit 7623cc4

Browse files
committed
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>
2 parents 193d18f + 0ff5e81 commit 7623cc4

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,8 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,
511511
if (sta) {
512512
sta_entry = (struct rtl_sta_info *)sta->drv_priv;
513513
tid = ieee80211_get_tid(hdr);
514-
agg_state = sta_entry->tids[tid].agg.agg_state;
514+
if (tid < MAX_TID_COUNT)
515+
agg_state = sta_entry->tids[tid].agg.agg_state;
515516
ampdu_density = sta->deflink.ht_cap.ampdu_density;
516517
}
517518

drivers/net/wireless/realtek/rtw88/sdio.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,10 @@ static u32 rtw_sdio_to_io_address(struct rtw_dev *rtwdev, u32 addr,
144144

145145
static bool rtw_sdio_use_direct_io(struct rtw_dev *rtwdev, u32 addr)
146146
{
147+
bool might_indirect_under_power_off = rtwdev->chip->id == RTW_CHIP_TYPE_8822C;
148+
147149
if (!test_bit(RTW_FLAG_POWERON, rtwdev->flags) &&
148-
!rtw_sdio_is_bus_addr(addr))
150+
!rtw_sdio_is_bus_addr(addr) && might_indirect_under_power_off)
149151
return false;
150152

151153
return !rtw_sdio_is_sdio30_supported(rtwdev) ||

drivers/net/wireless/realtek/rtw88/usb.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -965,8 +965,7 @@ static int rtw_usb_init_rx(struct rtw_dev *rtwdev)
965965
struct sk_buff *rx_skb;
966966
int i;
967967

968-
rtwusb->rxwq = alloc_workqueue("rtw88_usb: rx wq", WQ_BH | WQ_UNBOUND,
969-
0);
968+
rtwusb->rxwq = alloc_workqueue("rtw88_usb: rx wq", WQ_BH, 0);
970969
if (!rtwusb->rxwq) {
971970
rtw_err(rtwdev, "failed to create RX work queue\n");
972971
return -ENOMEM;

0 commit comments

Comments
 (0)