diff options
author | Daniel C Halperin <daniel.c.halperin@intel.com> | 2009-08-13 16:30:59 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-20 11:33:12 -0400 |
commit | b261793da587160d12ce6d63db60493342ddce20 (patch) | |
tree | d6c8d01469cfadc1afffb8306ca5d8f73455ffe8 /drivers/net/wireless/iwlwifi/iwl-3945.c | |
parent | 28e6f48953f44f7eb615383efe6e7f17624a11bb (diff) |
iwlwifi: use station HT capabilities and BSS operating mode for Green-field
Green-field mode should be configured in the HT station table. This patch uses
both the per-station GF support flag as well as the current BSS HT operation
mode (non-GF stations present flag).
Added the "ht_greenfield_support" field to struct iwl_cfg to replace the
device-specific check in rs_use_green(). That check has been moved to
iwlcore_init_ht_hw_capab().
Signed-off-by: Daniel C Halperin <daniel.c.halperin@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index ba5ef832d770..b5a4d2ecdd2d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c | |||
@@ -2889,7 +2889,8 @@ static struct iwl_cfg iwl3945_bg_cfg = { | |||
2889 | .eeprom_ver = EEPROM_3945_EEPROM_VERSION, | 2889 | .eeprom_ver = EEPROM_3945_EEPROM_VERSION, |
2890 | .ops = &iwl3945_ops, | 2890 | .ops = &iwl3945_ops, |
2891 | .mod_params = &iwl3945_mod_params, | 2891 | .mod_params = &iwl3945_mod_params, |
2892 | .use_isr_legacy = true | 2892 | .use_isr_legacy = true, |
2893 | .ht_greenfield_support = false, | ||
2893 | }; | 2894 | }; |
2894 | 2895 | ||
2895 | static struct iwl_cfg iwl3945_abg_cfg = { | 2896 | static struct iwl_cfg iwl3945_abg_cfg = { |
@@ -2902,7 +2903,8 @@ static struct iwl_cfg iwl3945_abg_cfg = { | |||
2902 | .eeprom_ver = EEPROM_3945_EEPROM_VERSION, | 2903 | .eeprom_ver = EEPROM_3945_EEPROM_VERSION, |
2903 | .ops = &iwl3945_ops, | 2904 | .ops = &iwl3945_ops, |
2904 | .mod_params = &iwl3945_mod_params, | 2905 | .mod_params = &iwl3945_mod_params, |
2905 | .use_isr_legacy = true | 2906 | .use_isr_legacy = true, |
2907 | .ht_greenfield_support = false, | ||
2906 | }; | 2908 | }; |
2907 | 2909 | ||
2908 | struct pci_device_id iwl3945_hw_card_ids[] = { | 2910 | struct pci_device_id iwl3945_hw_card_ids[] = { |