diff options
| author |   Reinette Chatre <reinette.chatre@intel.com> | 2009-12-14 14:12:13 -0800 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2009-12-21 11:32:14 -0500 |
| commit | 6c3069b1e7e983e176a5f826e2edffefdd404a08 (patch) | |
| tree | 7e0b84234ecdac2912ea5e794412f2c56f2d499f /drivers/net/wireless | |
| parent | iwl3945: fix panic in iwl3945 driver (diff) | |
| download | linux-dev-6c3069b1e7e983e176a5f826e2edffefdd404a08.tar.xz linux-dev-6c3069b1e7e983e176a5f826e2edffefdd404a08.zip | |
iwlwifi: fix 40MHz operation setting on cards that do not allow it
Some devices have 40MHz operation disabled entirely. Ensure that driver do
not enable 40MHz operation if a channel does not allow this.
This fixes http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2135
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
CC: stable@kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-eeprom.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c index 08ad6e41a1cc..4a30969689ff 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c @@ -749,7 +749,8 @@ static int iwl_mod_ht40_chan_info(struct iwl_priv *priv, ch_info->ht40_eeprom = *eeprom_ch; ch_info->ht40_max_power_avg = eeprom_ch->max_power_avg; ch_info->ht40_flags = eeprom_ch->flags; - ch_info->ht40_extension_channel &= ~clear_ht40_extension_channel; + if (eeprom_ch->flags & EEPROM_CHANNEL_VALID) + ch_info->ht40_extension_channel &= ~clear_ht40_extension_channel; return 0; } |