aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/cfg80211.c
diff options
context:
space:
mode:
authorBing Zhao <bzhao@marvell.com>2012-09-10 21:30:46 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-09-11 15:31:55 -0400
commit77c8a14b1f04b823388700195c547fdb6b625d49 (patch)
treecda5acef0268f9c61bda46b4709c9eed3cd61d59 /drivers/net/wireless/mwifiex/cfg80211.c
parente89e2da29b7e2cba217a3e91a3106b708d0b878d (diff)
mwifiex: do not hint regulatory domain with f/w country code
We will use world regulatory domain (country 00) as default when driver is loaded. Later after a successful association cfg80211 will change the regulatory domain to a specific country if the AP has advertised country IE. Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex/cfg80211.c')
-rw-r--r--drivers/net/wireless/mwifiex/cfg80211.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 3a275544b336..797f978c17b4 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -1862,8 +1862,9 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
1862 return ret; 1862 return ret;
1863 } 1863 }
1864 country_code = mwifiex_11d_code_2_region(priv->adapter->region_code); 1864 country_code = mwifiex_11d_code_2_region(priv->adapter->region_code);
1865 if (country_code && regulatory_hint(wiphy, country_code)) 1865 if (country_code)
1866 dev_err(adapter->dev, "regulatory_hint() failed\n"); 1866 dev_info(adapter->dev,
1867 "ignoring F/W country code %2.2s\n", country_code);
1867 1868
1868 adapter->wiphy = wiphy; 1869 adapter->wiphy = wiphy;
1869 return ret; 1870 return ret;