Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ea51fc7 authored by Arend Van Spriel's avatar Arend Van Spriel Committed by Kalle Valo
Browse files

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: default avatarHante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: default avatarFranky Lin <franky.lin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 6594e1e8

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+16 −4
Original line number Diff line number Diff line
@@ -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;



	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;

}