mt76: mt7615: scan all channels if not specified
authorLorenzo Bianconi <lorenzo@kernel.org>
Wed, 6 May 2020 09:58:32 +0000 (11:58 +0200)
committerFelix Fietkau <nbd@nbd.name>
Tue, 12 May 2020 17:52:35 +0000 (19:52 +0200)
Configure the mcu to scan all available channels if mac80211 does not
provide any frequency list

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c

index 19b59a7550b6c481f124368f5b991e16834010ad..96bf39a4a3da21a9e2fc4f522cfd8e4492c60843 100644 (file)
@@ -2806,7 +2806,6 @@ int mt7615_mcu_hw_scan(struct mt7615_phy *phy, struct ieee80211_vif *vif,
        req->scan_type = sreq->n_ssids ? 1 : 0;
        req->probe_req_num = sreq->n_ssids ? 2 : 0;
        req->version = 1;
-       req->channel_type = 4;
 
        for (i = 0; i < sreq->n_ssids; i++) {
                if (!sreq->ssids[i].ssid_len)
@@ -2835,6 +2834,7 @@ int mt7615_mcu_hw_scan(struct mt7615_phy *phy, struct ieee80211_vif *vif,
                chan->band = scan_list[i]->band == NL80211_BAND_2GHZ ? 1 : 2;
                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);
@@ -2930,7 +2930,7 @@ int mt7615_mcu_sched_scan_req(struct mt7615_phy *phy,
                req->match[i].ssid_len = match->ssid.ssid_len;
        }
 
-       req->channel_type = 4;
+       req->channel_type = sreq->n_channels ? 4 : 0;
        req->channels_num = min_t(u8, sreq->n_channels, 64);
        for (i = 0; i < req->channels_num; i++) {
                chan = &req->channels[i];