Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c3069b1 authored by Reinette Chatre's avatar Reinette Chatre Committed by John W. Linville
Browse files

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: default avatarReinette Chatre <reinette.chatre@intel.com>
CC: stable@kernel.org
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent dc57a303

drivers/net/wireless/iwlwifi/iwl-eeprom.c

+2 −1
Original line number Diff line number Diff line
@@ -749,6 +749,7 @@ 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;

	if (eeprom_ch->flags & EEPROM_CHANNEL_VALID)

		ch_info->ht40_extension_channel &= ~clear_ht40_extension_channel;



	return 0;