Commit dc9e7e65 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge tag 'wireless-2025-11-20' of... 

Merge tag 'wireless-2025-11-20' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless

Johannes Berg says:

====================
wireless-2025-11-20

A single fix for scanning on some rtw89 devices.

* tag 'wireless-2025-11-20' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  wifi: rtw89: hw_scan: Don't let the operating channel be last
====================

Link: https://patch.msgid.link/20251120085433.8601-3-johannes@sipsolutions.net


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents d70b5925 0ff8eeaf

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++;