* [PATCH] brcmsmac: fix brcms_c_regd_init() which crashed after 11ad patch
@ 2012-07-03 13:14 Arend van Spriel
2012-07-03 13:26 ` Seth Forshee
0 siblings, 1 reply; 4+ messages in thread
From: Arend van Spriel @ 2012-07-03 13:14 UTC (permalink / raw)
To: John W. Linville
Cc: Linux Wireless List, Arend van Spriel, Vladimir Kondratiev,
Johannes Berg, Seth Forshee
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>
Cc: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
drivers/net/wireless/brcm80211/brcmsmac/channel.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
index 2d365d3..2643669 100644
--- 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))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] brcmsmac: fix brcms_c_regd_init() which crashed after 11ad patch
2012-07-03 13:14 [PATCH] brcmsmac: fix brcms_c_regd_init() which crashed after 11ad patch Arend van Spriel
@ 2012-07-03 13:26 ` Seth Forshee
2012-07-03 16:33 ` Arend van Spriel
0 siblings, 1 reply; 4+ messages in thread
From: Seth Forshee @ 2012-07-03 13:26 UTC (permalink / raw)
To: Arend van Spriel
Cc: John W. Linville, Linux Wireless List, Vladimir Kondratiev,
Johannes Berg
On Tue, Jul 03, 2012 at 03:14:40PM +0200, Arend van Spriel wrote:
> 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>
> Cc: Seth Forshee <seth.forshee@canonical.com>
> Signed-off-by: Arend van Spriel <arend@broadcom.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Just one minor nit ...
> + if (band_idx == BAND_2G_INDEX) {
> + sband = wiphy->bands[IEEE80211_BAND_2GHZ];
> + } else {
> + sband = wiphy->bands[IEEE80211_BAND_5GHZ];
> + }
No need for braces here.
Cheers,
Seth
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] brcmsmac: fix brcms_c_regd_init() which crashed after 11ad patch
2012-07-03 13:26 ` Seth Forshee
@ 2012-07-03 16:33 ` Arend van Spriel
0 siblings, 0 replies; 4+ messages in thread
From: Arend van Spriel @ 2012-07-03 16:33 UTC (permalink / raw)
To: Seth Forshee
Cc: John W. Linville, Linux Wireless List, Vladimir Kondratiev,
Johannes Berg
On 07/03/2012 03:26 PM, Seth Forshee wrote:
> On Tue, Jul 03, 2012 at 03:14:40PM +0200, Arend van Spriel wrote:
>> 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>
>> Cc: Seth Forshee <seth.forshee@canonical.com>
>> Signed-off-by: Arend van Spriel <arend@broadcom.com>
>
> Acked-by: Seth Forshee <seth.forshee@canonical.com>
>
> Just one minor nit ...
>
>> + if (band_idx == BAND_2G_INDEX) {
>> + sband = wiphy->bands[IEEE80211_BAND_2GHZ];
>> + } else {
>> + sband = wiphy->bands[IEEE80211_BAND_5GHZ];
>> + }
>
> No need for braces here.
I hate nits so I will remove them.
Gr. AvS
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] brcmsmac: fix brcms_c_regd_init() which crashed after 11ad patch
@ 2012-07-03 18:46 Arend van Spriel
0 siblings, 0 replies; 4+ messages in thread
From: Arend van Spriel @ 2012-07-03 18:46 UTC (permalink / raw)
To: John W. Linville
Cc: Linux Wireless List, Arend van Spriel, Vladimir Kondratiev,
Johannes Berg
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>
---
drivers/net/wireless/brcm80211/brcmsmac/channel.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
index 2d365d3..9a4c63f 100644
--- 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))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-07-03 18:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-03 13:14 [PATCH] brcmsmac: fix brcms_c_regd_init() which crashed after 11ad patch Arend van Spriel
2012-07-03 13:26 ` Seth Forshee
2012-07-03 16:33 ` Arend van Spriel
-- strict thread matches above, loose matches on Subject: below --
2012-07-03 18:46 Arend van Spriel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).