brcmfmac: only add channels and ssids once in scan request

When receiving pno results there may be duplicate channels and/or
ssids. Assure each is added only once when preparing the internal
escan request.

Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: Franky Lin <franky.lin@broadcom.com>
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index b687533e5c2805c8c47b8a89eb5e2a92a4475aa3..0a067e59f90b5418d9f730067925be15660a1119 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -3216,7 +3216,7 @@ static int brcmf_internal_escan_add_info(struct cfg80211_scan_request *req,
 {
        struct ieee80211_channel *chan;
        enum nl80211_band band;
-       int freq;
+       int freq, i;
 
        if (channel <= CH_MAX_2G_CHANNEL)
                band = NL80211_BAND_2GHZ;
@@ -3231,10 +3231,22 @@ static int brcmf_internal_escan_add_info(struct cfg80211_scan_request *req,
        if (!chan)
                return -EINVAL;
 
-       req->channels[req->n_channels++] = chan;
-       memcpy(req->ssids[req->n_ssids].ssid, ssid, ssid_len);
-       req->ssids[req->n_ssids++].ssid_len = ssid_len;
+       for (i = 0; i < req->n_channels; i++) {
+               if (req->channels[i] == chan)
+                       break;
+       }
+       if (i == req->n_channels)
+               req->channels[req->n_channels++] = chan;
 
+       for (i = 0; i < req->n_ssids; i++) {
+               if (req->ssids[i].ssid_len == ssid_len &&
+                   !memcmp(req->ssids[i].ssid, ssid, ssid_len))
+                       break;
+       }
+       if (i == req->n_ssids) {
+               memcpy(req->ssids[req->n_ssids].ssid, ssid, ssid_len);
+               req->ssids[req->n_ssids++].ssid_len = ssid_len;
+       }
        return 0;
 }