浏览代码

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>
Luis R. Rodriguez 16 年之前
父节点
当前提交
ea4a82dcee
共有 2 个文件被更改,包括 5 次插入0 次删除
  1. 3 0
      drivers/net/wireless/iwlwifi/iwl-core.c
  2. 2 0
      drivers/net/wireless/iwlwifi/iwl3945-base.c

+ 3 - 0
drivers/net/wireless/iwlwifi/iwl-core.c

@@ -832,6 +832,9 @@ int iwl_setup_mac(struct iwl_priv *priv)
 		BIT(NL80211_IFTYPE_AP) |
 		BIT(NL80211_IFTYPE_AP) |
 		BIT(NL80211_IFTYPE_STATION) |
 		BIT(NL80211_IFTYPE_STATION) |
 		BIT(NL80211_IFTYPE_ADHOC);
 		BIT(NL80211_IFTYPE_ADHOC);
+
+	hw->wiphy->fw_handles_regulatory = true;
+
 	/* Default value; 4 EDCA QOS priorities */
 	/* Default value; 4 EDCA QOS priorities */
 	hw->queues = 4;
 	hw->queues = 4;
 	/* queues to support 11n aggregation */
 	/* queues to support 11n aggregation */

+ 2 - 0
drivers/net/wireless/iwlwifi/iwl3945-base.c

@@ -7850,6 +7850,8 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
 		BIT(NL80211_IFTYPE_STATION) |
 		BIT(NL80211_IFTYPE_STATION) |
 		BIT(NL80211_IFTYPE_ADHOC);
 		BIT(NL80211_IFTYPE_ADHOC);
 
 
+	hw->wiphy->fw_handles_regulatory = true;
+
 	/* 4 EDCA QOS priorities */
 	/* 4 EDCA QOS priorities */
 	hw->queues = 4;
 	hw->queues = 4;