aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-core.c
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2008-11-12 17:22:04 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-11-25 16:41:27 -0500
commitea4a82dceec7b5782b1259079c8de508d0afe33a (patch)
treebdae54ce3a44d1e9ea52c1934c57946ab8a258fa /drivers/net/wireless/iwlwifi/iwl-core.c
parent14b9815af3f4fe0e171ee0c4325c31d2a2c1570b (diff)
iwlwifi: enable custom fw regulatory solution
This enables the custom firmware regulatory solution option on iwlwifi drivers. These devices are uncapable of mapping their EEPROM regulatory domain to a specific ISO / IEC alpha2. Although the new 11n devices (>= iwl 5000) have only 3 regultaory SKUs -- MOW, ABG (no N) and BG -- the older devices (3945 and 4965) have a more complex SKU arrangement and therefore its not practical to move this to the driver. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Acked-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 8bd4d087d4e2..fccd150ae5ca 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -832,6 +832,9 @@ int iwl_setup_mac(struct iwl_priv *priv)
832 BIT(NL80211_IFTYPE_AP) | 832 BIT(NL80211_IFTYPE_AP) |
833 BIT(NL80211_IFTYPE_STATION) | 833 BIT(NL80211_IFTYPE_STATION) |
834 BIT(NL80211_IFTYPE_ADHOC); 834 BIT(NL80211_IFTYPE_ADHOC);
835
836 hw->wiphy->fw_handles_regulatory = true;
837
835 /* Default value; 4 EDCA QOS priorities */ 838 /* Default value; 4 EDCA QOS priorities */
836 hw->queues = 4; 839 hw->queues = 4;
837 /* queues to support 11n aggregation */ 840 /* queues to support 11n aggregation */