Commit 23792ced authored by Ming Yen Hsieh's avatar Ming Yen Hsieh Committed by Felix Fietkau
Browse files

wifi: mt76: fix 6GHz high channel not be scanned 



mt76 scan command only support 64 channels currently. If the
channel count is larger than 64(for 2+5+6GHz), some channels will
not be scanned. Hence change the scan type to full channel scan
in case of the command cannot include proper list for chip.

Fixes: 399090ef ("mt76: mt76_connac: move hw_scan and sched_scan routine in mt76_connac_mcu module")
Reported-by: default avatarBen Greear <greearb@candelatech.com>
Tested-by: default avatarIsaac Konikoff <konikofi@candelatech.com>
Signed-off-by: default avatarMing Yen Hsieh <mingyen.hsieh@mediatek.com>
Signed-off-by: default avatarDeren Wu <deren.wu@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent c397fc1e

drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c

+10 −3
Original line number Diff line number Diff line
@@ -1678,8 +1678,16 @@ int mt76_connac_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif, 
	req->channel_min_dwell_time = cpu_to_le16(duration);

	req->channel_dwell_time = cpu_to_le16(duration);



	if (sreq->n_channels == 0 || sreq->n_channels > 64) {

		req->channel_type = 0;

		req->channels_num = 0;

		req->ext_channels_num = 0;

	} else {

		req->channel_type = 4;

		req->channels_num = min_t(u8, sreq->n_channels, 32);

		req->ext_channels_num = min_t(u8, ext_channels_num, 32);

	}



	for (i = 0; i < req->channels_num + req->ext_channels_num; i++) {

		if (i >= 32)

			chan = &req->ext_channels[i - 32];
@@ -1699,7 +1707,6 @@ int mt76_connac_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif, 
		}

		chan->channel_num = scan_list[i]->hw_value;

	}

	req->channel_type = sreq->n_channels ? 4 : 0;



	if (sreq->ie_len > 0) {

		memcpy(req->ies, sreq->ie, sreq->ie_len);