diff options
author | Rafał Miłecki <rafal@milecki.pl> | 2019-07-22 10:45:38 +0200 |
---|---|---|
committer | Rafał Miłecki <rafal@milecki.pl> | 2019-07-22 14:15:17 +0200 |
commit | a63907b3bbb07724d6526b20ae18ad90f351e954 (patch) | |
tree | 8fc98251910be8d12cfbbd387c35ce307cff7acc /package/kernel/mac80211/patches/319-v4.12-0009-brcmfmac-only-add-channels-and-ssids-once-in-scan-re.patch | |
parent | 1592815b2c852da83a8dcc62ffae967b6d7ea9d9 (diff) | |
download | upstream-a63907b3bbb07724d6526b20ae18ad90f351e954.tar.gz upstream-a63907b3bbb07724d6526b20ae18ad90f351e954.tar.bz2 upstream-a63907b3bbb07724d6526b20ae18ad90f351e954.zip |
mac80211: brcmfmac: rename v4.12 patches to allow more backports
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'package/kernel/mac80211/patches/319-v4.12-0009-brcmfmac-only-add-channels-and-ssids-once-in-scan-re.patch')
-rw-r--r-- | package/kernel/mac80211/patches/319-v4.12-0009-brcmfmac-only-add-channels-and-ssids-once-in-scan-re.patch | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/package/kernel/mac80211/patches/319-v4.12-0009-brcmfmac-only-add-channels-and-ssids-once-in-scan-re.patch b/package/kernel/mac80211/patches/319-v4.12-0009-brcmfmac-only-add-channels-and-ssids-once-in-scan-re.patch deleted file mode 100644 index 7bff17f904..0000000000 --- a/package/kernel/mac80211/patches/319-v4.12-0009-brcmfmac-only-add-channels-and-ssids-once-in-scan-re.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 6ea51fc708aedcf411f355de65a704ecda501bc4 Mon Sep 17 00:00:00 2001 -From: Arend Van Spriel <arend.vanspriel@broadcom.com> -Date: Thu, 6 Apr 2017 13:14:42 +0100 -Subject: [PATCH] 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> ---- - .../wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 20 ++++++++++++++++---- - 1 file changed, 16 insertions(+), 4 deletions(-) - ---- 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 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 - 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; - } - |