wifi: rtw89: refine 6 GHz scanning dwell time

Reduce dwell time to improve scan duration in 6 GHz. This is required
for scan requests that does not include RNR parsing and does full
channel scan.

Signed-off-by: Po-Hao Huang <phhuang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20221214091952.42792-1-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index 50fd97a22ffa9ba38f5293c9fd043560a3162958..0328874a0d10ee149cd98ba1bf9ca5eee171e23a 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -2749,7 +2749,7 @@ static void rtw89_hw_scan_add_chan(struct rtw89_dev *rtwdev, int chan_type,
                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;
+                               ch_info->period -= RTW89_DWELL_TIME_6G;
                }
        }
 
@@ -2802,7 +2802,8 @@ static int rtw89_hw_scan_add_chan_list(struct rtw89_dev *rtwdev,
                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;
+                       ch_info->period = RTW89_CHANNEL_TIME_6G +
+                                         RTW89_DWELL_TIME_6G;
                else
                        ch_info->period = RTW89_CHANNEL_TIME;
 

diff --git a/drivers/net/wireless/realtek/rtw89/fw.h b/drivers/net/wireless/realtek/rtw89/fw.h
index 4326e0ede54b8c1662520c165f05952764cf493c..3ce59ac48f433b0f389cbd8dac4865d31f68ee4b 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.h
+++ b/drivers/net/wireless/realtek/rtw89/fw.h
@@ -205,6 +205,7 @@ struct rtw89_h2creg_sch_tx_en {
 #define RTW89_DFS_CHAN_TIME 105
 #define RTW89_OFF_CHAN_TIME 100
 #define RTW89_DWELL_TIME 20
+#define RTW89_DWELL_TIME_6G 10
 #define RTW89_SCAN_WIDTH 0
 #define RTW89_SCANOFLD_MAX_SSID 8
 #define RTW89_SCANOFLD_MAX_IE_LEN 512