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

Commit d7d14401 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: remove unused parameter from iwl_channel_info 



Number of HT40 power parameters are not used; remove those from
iwl_channel_info data structure

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 85bb174a

drivers/net/wireless/iwlwifi/iwl-dev.h

+0 −3
Original line number Diff line number Diff line
@@ -295,9 +295,6 @@ struct iwl_channel_info { 


	/* HT40 channel info */

	s8 ht40_max_power_avg;	/* (dBm) regul. eeprom, normal Tx, any rate */

	s8 ht40_curr_txpow;	/* (dBm) regulatory/spectrum/user (not h/w) */

	s8 ht40_min_power;	/* always 0 */

	s8 ht40_scan_power;	/* (dBm) eeprom, direct scans, any rate */

	u8 ht40_flags;		/* flags copied from EEPROM */

	u8 ht40_extension_channel; /* HT_IE_EXT_CHANNEL_* */

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

+0 −7
Original line number Diff line number Diff line
@@ -751,9 +751,6 @@ 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_curr_txpow = eeprom_ch->max_power_avg;

	ch_info->ht40_min_power = 0;

	ch_info->ht40_scan_power = eeprom_ch->max_power_avg;

	ch_info->ht40_flags = eeprom_ch->flags;

	ch_info->ht40_extension_channel &= ~clear_ht40_extension_channel;
@@ -840,8 +837,6 @@ static s8 iwl_update_common_txpower(struct iwl_priv *priv, 
		    (ch_info->ht40_max_power_avg < max_txpower_avg)) {

			/* Update regulatory-based run-time data */

			ch_info->ht40_max_power_avg = max_txpower_avg;

			ch_info->ht40_curr_txpow = max_txpower_avg;

			ch_info->ht40_scan_power = max_txpower_avg;

		}

		ch_info++;

	}
@@ -881,8 +876,6 @@ static s8 iwl_update_channel_txpower(struct iwl_priv *priv, 
			    (ch_info->ht40_max_power_avg < max_txpower_avg)) {

				/* Update regulatory-based run-time data */

				ch_info->ht40_max_power_avg = max_txpower_avg;

				ch_info->ht40_curr_txpow = max_txpower_avg;

				ch_info->ht40_scan_power = max_txpower_avg;

			}

			break;

		}