Commit 0ff8eeaf authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge tag 'rtw-2025-11-20' of https://github.com/pkshih/rtw 

Ping-Ke Shih says:
==================
rtw patches for v6.18-rc7

Fix firmware goes wrong and causes device unusable after scanning. This
issue presents under certain regulatory domain reported from end users.
==================

Link: https://patch.msgid.link/8217bee0-96c4-44c1-9593-2e9ca12eccc5@RTKEXHMBS03.realtek.com.tw


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents d0309c05 e837b909

drivers/net/wireless/realtek/rtw89/fw.c

+7 −0
Original line number Diff line number Diff line
@@ -7694,6 +7694,13 @@ int rtw89_hw_scan_add_chan_list_ax(struct rtw89_dev *rtwdev, 
	INIT_LIST_HEAD(&list);



	list_for_each_entry_safe(ch_info, tmp, &scan_info->chan_list, list) {

		/* The operating channel (tx_null == true) should

		 * not be last in the list, to avoid breaking

		 * RTL8851BU and RTL8832BU.

		 */

		if (list_len + 1 == RTW89_SCAN_LIST_LIMIT_AX && ch_info->tx_null)

			break;



		list_move_tail(&ch_info->list, &list);



		list_len++;