Commit 7623cc42 authored by Johannes Berg's avatar Johannes Berg
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
parents 193d18f6 0ff5e81e

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

+2 −1
Original line number Diff line number Diff line
@@ -511,6 +511,7 @@ 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);

		if (tid < MAX_TID_COUNT)

			agg_state = sta_entry->tids[tid].agg.agg_state;

		ampdu_density = sta->deflink.ht_cap.ampdu_density;

	}

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

+3 −1
Original line number Diff line number Diff line
@@ -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) ||

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

+1 −2
Original line number Diff line number Diff line
@@ -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;