Patchwork [Quantal,1/1] brcmsmac: fix mismatch in number of custom regulatory rules

login
register
mail settings
Submitter Joseph Salisbury
Date March 19, 2013, 6:29 p.m.
Message ID <a10a20c487474d38fbbf346cc029808ada341d73.1363717140.git.joseph.salisbury@canonical.com>
Download mbox | patch
Permalink /patch/229172/
State New
Headers show

Comments

Joseph Salisbury - March 19, 2013, 6:29 p.m.
From: Arend van Spriel <arend@broadcom.com>

BugLink: http://bugs.launchpad.net/bugs/1156769

The driver provides the cfg80211 regulatory framework with a set of
custom rules. However, there was a mismatch in number of rules
and the actual rules provided. This resulted in setting an invalid
power level:

ieee80211 phy0: brcms_ops_config: change channel 13
ieee80211 phy0: brcms_ops_config: Error setting power_level (8758364)

Closer look in cfg80211 regulatory blurb showed following bogus rule:
cfg80211: 0 KHz - -60446948 KHz @ 875836468 KHz), (875836468 mBi, 875836468 mBm)

Cc: Seth Forshee <seth.forshee@canonical.com>
Reviewed-by: Piotr Haber <phaber@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>

(cherry picked from commit 8a0961482698290713d14d7755d9280397804487)
---
 drivers/net/wireless/brcm80211/brcmsmac/channel.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Seth Forshee - March 19, 2013, 6:45 p.m.

Patch

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
index cb52f44..f9e4590 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/channel.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
@@ -77,7 +77,7 @@ 
 					 NL80211_RRF_NO_IBSS)
 
 static const struct ieee80211_regdomain brcms_regdom_x2 = {
-	.n_reg_rules = 7,
+	.n_reg_rules = 6,
 	.alpha2 = "X2",
 	.reg_rules = {
 		BRCM_2GHZ_2412_2462,