From 887298d25147ea805f65cc90824bbd7a314444dc Mon Sep 17 00:00:00 2001 From: Prasanna Kerekoppa Date: Tue, 28 Mar 2023 02:24:13 -0500 Subject: [PATCH 147/296] brcmfmac: Restore channel info --- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index f50487a6d24f..b303d80d41fc 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -8297,17 +8297,29 @@ static int brcmf_construct_chaninfo(struct brcmf_cfg80211_info *cfg, } band = wiphy->bands[NL80211_BAND_2GHZ]; - if (band) + if (band) { + /* restore channels info */ + memcpy(band->channels, &__wl_2ghz_channels, sizeof(__wl_2ghz_channels)); + band->n_channels = ARRAY_SIZE(__wl_2ghz_channels); for (i = 0; i < band->n_channels; i++) band->channels[i].flags = IEEE80211_CHAN_DISABLED; + } band = wiphy->bands[NL80211_BAND_5GHZ]; - if (band) + if (band) { + /* restore channels info */ + memcpy(band->channels, &__wl_5ghz_channels, sizeof(__wl_5ghz_channels)); + band->n_channels = ARRAY_SIZE(__wl_5ghz_channels); for (i = 0; i < band->n_channels; i++) band->channels[i].flags = IEEE80211_CHAN_DISABLED; + } band = wiphy->bands[NL80211_BAND_6GHZ]; - if (band) + if (band) { + /* restore channels info */ + memcpy(band->channels, &__wl_6ghz_channels, sizeof(__wl_6ghz_channels)); + band->n_channels = ARRAY_SIZE(__wl_6ghz_channels); for (i = 0; i < band->n_channels; i++) band->channels[i].flags = IEEE80211_CHAN_DISABLED; + } total = le32_to_cpu(list->count); if (total > BRCMF_MAX_CHANSPEC_LIST) { -- 2.25.1