Commit 54997c24 authored by Po-Hao Huang's avatar Po-Hao Huang Committed by Kalle Valo
Browse files

wifi: rtw89: correct 6 GHz scan behavior 



Change active scan behavior to fit 6GHz requirements. There are many
different rules on active scan between 6GHz and 2GHz/5GHz, so if the
SSID is not specified, do fast passive scanning and limit number of
probe requests we send for now until new firmware can support all
rules.

Signed-off-by: default avatarPo-Hao Huang <phhuang@realtek.com>
Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20221007045900.10823-1-pkshih@realtek.com
parent 6b069898

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

+22 −6
Original line number Diff line number Diff line
@@ -2565,6 +2565,9 @@ static void rtw89_hw_scan_add_chan(struct rtw89_dev *rtwdev, int chan_type, 
				   struct rtw89_mac_chinfo *ch_info)

{

	struct rtw89_hw_scan_info *scan_info = &rtwdev->scan_info;

	struct ieee80211_vif *vif = rtwdev->scan_info.scanning_vif;

	struct rtw89_vif *rtwvif = (struct rtw89_vif *)vif->drv_priv;

	struct cfg80211_scan_request *req = rtwvif->scan_req;

	struct rtw89_pktofld_info *info;

	u8 band, probe_count = 0;
@@ -2576,13 +2579,13 @@ static void rtw89_hw_scan_add_chan(struct rtw89_dev *rtwdev, int chan_type, 
	ch_info->tx_pwr_idx = 0;

	ch_info->tx_null = false;

	ch_info->pause_data = false;

	ch_info->probe_id = RTW89_SCANOFLD_PKT_NONE;



	if (ssid_num) {

		ch_info->num_pkt = ssid_num;

		band = rtw89_hw_to_nl80211_band(ch_info->ch_band);



		list_for_each_entry(info, &scan_info->pkt_list[band], list) {

			ch_info->probe_id = info->id;

			ch_info->pkt_id[probe_count] = info->id;

			if (++probe_count >= ssid_num)

				break;
@@ -2591,9 +2594,16 @@ static void rtw89_hw_scan_add_chan(struct rtw89_dev *rtwdev, int chan_type, 
			rtw89_err(rtwdev, "SSID num differs from list len\n");

	}



	if (ch_info->ch_band == RTW89_BAND_6G) {

		if (ssid_num == 1 && req->ssids[0].ssid_len == 0) {

			ch_info->tx_pkt = false;

			if (!req->duration_mandatory)

				ch_info->period -= RTW89_DWELL_TIME;

		}

	}



	switch (chan_type) {

	case RTW89_CHAN_OPERATE:

		ch_info->probe_id = RTW89_SCANOFLD_PKT_NONE;

		ch_info->central_ch = scan_info->op_chan;

		ch_info->pri_ch = scan_info->op_pri_ch;

		ch_info->ch_band = scan_info->op_band;
@@ -2602,6 +2612,7 @@ static void rtw89_hw_scan_add_chan(struct rtw89_dev *rtwdev, int chan_type, 
		ch_info->num_pkt = 0;

		break;

	case RTW89_CHAN_DFS:

		if (ch_info->ch_band != RTW89_BAND_6G)

			ch_info->period = max_t(u8, ch_info->period,

						RTW89_DFS_CHAN_TIME);

		ch_info->dwell_time = RTW89_DWELL_TIME;
@@ -2637,8 +2648,13 @@ static int rtw89_hw_scan_add_chan_list(struct rtw89_dev *rtwdev, 
			goto out;

		}



		ch_info->period = req->duration_mandatory ?

				  req->duration : RTW89_CHANNEL_TIME;

		if (req->duration_mandatory)

			ch_info->period = req->duration;

		else if (channel->band == NL80211_BAND_6GHZ)

			ch_info->period = RTW89_CHANNEL_TIME_6G + RTW89_DWELL_TIME;

		else

			ch_info->period = RTW89_CHANNEL_TIME;



		ch_info->ch_band = rtw89_nl80211_to_hw_band(channel->band);

		ch_info->central_ch = channel->hw_value;

		ch_info->pri_ch = channel->hw_value;

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

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ struct rtw89_h2creg_sch_tx_en { 


#define RTW89_H2C_MAX_SIZE 2048

#define RTW89_CHANNEL_TIME 45

#define RTW89_CHANNEL_TIME_6G 20

#define RTW89_DFS_CHAN_TIME 105

#define RTW89_OFF_CHAN_TIME 100

#define RTW89_DWELL_TIME 20