Skip to content

Commit 0ff8eea

Browse files
committed
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: Johannes Berg <johannes.berg@intel.com>
2 parents d0309c0 + e837b90 commit 0ff8eea

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

  • drivers/net/wireless/realtek/rtw89

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7694,6 +7694,13 @@ int rtw89_hw_scan_add_chan_list_ax(struct rtw89_dev *rtwdev,
76947694
INIT_LIST_HEAD(&list);
76957695

76967696
list_for_each_entry_safe(ch_info, tmp, &scan_info->chan_list, list) {
7697+
/* The operating channel (tx_null == true) should
7698+
* not be last in the list, to avoid breaking
7699+
* RTL8851BU and RTL8832BU.
7700+
*/
7701+
if (list_len + 1 == RTW89_SCAN_LIST_LIMIT_AX && ch_info->tx_null)
7702+
break;
7703+
76977704
list_move_tail(&ch_info->list, &list);
76987705

76997706
list_len++;

0 commit comments

Comments
 (0)