brcmsmac: fix brcms_c_regd_init() which crashed after 11ad patch

This patch fixes an OOPS in brcmsmac driver, which was introduced
by the 11ad patch 'cfg80211: add 802.11ad (60gHz band) support'.
The value IEEE80211_NUM_BANDS increased, which was used in the
brcms_c_regd_init() function.

Cc: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Cc: Johannes Berg <johannes.berg@intel.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
index 2d365d3486df9722e5c1642aaf3252fd9c311ad3..9a4c63f927cb1817ee666cc070f14d1a810083c0 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmsmac/channel.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
@@ -763,20 +763,17 @@ void brcms_c_regd_init(struct brcms_c_info *wlc)
        int band_idx, i;
 
        /* Disable any channels not supported by the phy */
-       for (band_idx = 0; band_idx < IEEE80211_NUM_BANDS; band_idx++) {
-               if (band_idx == IEEE80211_BAND_2GHZ)
-                       band = wlc->bandstate[BAND_2G_INDEX];
-               else
-                       band = wlc->bandstate[BAND_5G_INDEX];
-
-               /* skip if band not initialized */
-               if (band->pi == NULL)
-                       continue;
+       for (band_idx = 0; band_idx < wlc->pub->_nbands; band_idx++) {
+               band = wlc->bandstate[band_idx];
 
                wlc_phy_chanspec_band_validch(band->pi, band->bandtype,
                                              &sup_chan);
 
-               sband = wiphy->bands[band_idx];
+               if (band_idx == BAND_2G_INDEX)
+                       sband = wiphy->bands[IEEE80211_BAND_2GHZ];
+               else
+                       sband = wiphy->bands[IEEE80211_BAND_5GHZ];
+
                for (i = 0; i < sband->n_channels; i++) {
                        ch = &sband->channels[i];
                        if (!isset(sup_chan.vec, ch->hw_value))