mwifiex: do not hint regulatory domain with f/w country code
authorBing Zhao <bzhao@marvell.com>
Tue, 11 Sep 2012 01:30:46 +0000 (18:30 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Sep 2012 19:31:55 +0000 (15:31 -0400)
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>
drivers/net/wireless/mwifiex/cfg80211.c

index 3a275544b336617ea8c065869557e2519b442e4a..797f978c17b43b5354d0904922f55f802bef76d8 100644 (file)
@@ -1862,8 +1862,9 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
                return ret;
        }
        country_code = mwifiex_11d_code_2_region(priv->adapter->region_code);
-       if (country_code && regulatory_hint(wiphy, country_code))
-               dev_err(adapter->dev, "regulatory_hint() failed\n");
+       if (country_code)
+               dev_info(adapter->dev,
+                        "ignoring F/W country code %2.2s\n", country_code);
 
        adapter->wiphy = wiphy;
        return ret;