mt76: mt7615: reduce hw scan timeout

Differentiate hw scan channel time between passive and active scan

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
index 9cb8a9bb912b61ff5fb3808611c21707c51d60bc..e9ae7e94d8fd333ce7e56a2f2746824c9a6db262 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
@@ -2773,7 +2773,7 @@ int mt7615_mcu_set_channel_domain(struct mt7615_phy *phy)
                                       MCU_CMD_SET_CHAN_DOMAIN, false);
 }
 
-#define MT7615_SCAN_CHANNEL_TIME       120
+#define MT7615_SCAN_CHANNEL_TIME       60
 int mt7615_mcu_hw_scan(struct mt7615_phy *phy, struct ieee80211_vif *vif,
                       struct ieee80211_scan_request *scan_req)
 {
@@ -2819,6 +2819,9 @@ int mt7615_mcu_hw_scan(struct mt7615_phy *phy, struct ieee80211_vif *vif,
        req->ssid_type = n_ssids ? BIT(2) : BIT(0);
        req->ssids_num = n_ssids;
 
+       /* increase channel time for passive scan */
+       if (!sreq->n_ssids)
+               duration *= 2;
        req->timeout_value = cpu_to_le16(sreq->n_channels * duration);
        req->channel_min_dwell_time = cpu_to_le16(duration);
        req->channel_dwell_time = cpu_to_le16(duration);