diff options
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 3 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-eeprom.c | 7 |
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 9dea8fa08c0e..d0f091519793 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
@@ -295,9 +295,6 @@ struct iwl_channel_info { | |||
295 | 295 | ||
296 | /* HT40 channel info */ | 296 | /* HT40 channel info */ |
297 | s8 ht40_max_power_avg; /* (dBm) regul. eeprom, normal Tx, any rate */ | 297 | s8 ht40_max_power_avg; /* (dBm) regul. eeprom, normal Tx, any rate */ |
298 | s8 ht40_curr_txpow; /* (dBm) regulatory/spectrum/user (not h/w) */ | ||
299 | s8 ht40_min_power; /* always 0 */ | ||
300 | s8 ht40_scan_power; /* (dBm) eeprom, direct scans, any rate */ | ||
301 | u8 ht40_flags; /* flags copied from EEPROM */ | 298 | u8 ht40_flags; /* flags copied from EEPROM */ |
302 | u8 ht40_extension_channel; /* HT_IE_EXT_CHANNEL_* */ | 299 | u8 ht40_extension_channel; /* HT_IE_EXT_CHANNEL_* */ |
303 | 300 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c index 143728c6382e..e42eb6499f0e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c | |||
@@ -751,9 +751,6 @@ static int iwl_mod_ht40_chan_info(struct iwl_priv *priv, | |||
751 | 751 | ||
752 | ch_info->ht40_eeprom = *eeprom_ch; | 752 | ch_info->ht40_eeprom = *eeprom_ch; |
753 | ch_info->ht40_max_power_avg = eeprom_ch->max_power_avg; | 753 | ch_info->ht40_max_power_avg = eeprom_ch->max_power_avg; |
754 | ch_info->ht40_curr_txpow = eeprom_ch->max_power_avg; | ||
755 | ch_info->ht40_min_power = 0; | ||
756 | ch_info->ht40_scan_power = eeprom_ch->max_power_avg; | ||
757 | ch_info->ht40_flags = eeprom_ch->flags; | 754 | ch_info->ht40_flags = eeprom_ch->flags; |
758 | ch_info->ht40_extension_channel &= ~clear_ht40_extension_channel; | 755 | ch_info->ht40_extension_channel &= ~clear_ht40_extension_channel; |
759 | 756 | ||
@@ -840,8 +837,6 @@ static s8 iwl_update_common_txpower(struct iwl_priv *priv, | |||
840 | (ch_info->ht40_max_power_avg < max_txpower_avg)) { | 837 | (ch_info->ht40_max_power_avg < max_txpower_avg)) { |
841 | /* Update regulatory-based run-time data */ | 838 | /* Update regulatory-based run-time data */ |
842 | ch_info->ht40_max_power_avg = max_txpower_avg; | 839 | ch_info->ht40_max_power_avg = max_txpower_avg; |
843 | ch_info->ht40_curr_txpow = max_txpower_avg; | ||
844 | ch_info->ht40_scan_power = max_txpower_avg; | ||
845 | } | 840 | } |
846 | ch_info++; | 841 | ch_info++; |
847 | } | 842 | } |
@@ -881,8 +876,6 @@ static s8 iwl_update_channel_txpower(struct iwl_priv *priv, | |||
881 | (ch_info->ht40_max_power_avg < max_txpower_avg)) { | 876 | (ch_info->ht40_max_power_avg < max_txpower_avg)) { |
882 | /* Update regulatory-based run-time data */ | 877 | /* Update regulatory-based run-time data */ |
883 | ch_info->ht40_max_power_avg = max_txpower_avg; | 878 | ch_info->ht40_max_power_avg = max_txpower_avg; |
884 | ch_info->ht40_curr_txpow = max_txpower_avg; | ||
885 | ch_info->ht40_scan_power = max_txpower_avg; | ||
886 | } | 879 | } |
887 | break; | 880 | break; |
888 | } | 881 | } |