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

Commit 5053e299 authored by Luca Coelho's avatar Luca Coelho Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: remove redundant d0i3 flag from the config struct 



The d0i3 flag in the device configuration structure is redundant,
because the same information can be determined by checking the
firmware capability flag.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 1e8f1329

drivers/net/wireless/intel/iwlwifi/iwl-8000.c

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ static const struct iwl_tt_params iwl8000_tt_params = { 
	.base_params = &iwl8000_base_params,				\

	.led_mode = IWL_LED_RF_STATE,					\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_8000,		\

	.d0i3 = true,							\

	.features = NETIF_F_RXCSUM,					\

	.non_shared_ant = ANT_A,					\

	.dccm_offset = IWL8260_DCCM_OFFSET,				\

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+0 −2
Original line number Diff line number Diff line
@@ -295,7 +295,6 @@ struct iwl_pwr_tx_backoff { 
 * @high_temp: Is this NIC is designated to be in high temperature.

 * @host_interrupt_operation_mode: device needs host interrupt operation

 *	mode set

 * @d0i3: device uses d0i3 instead of d3

 * @nvm_hw_section_num: the ID of the HW NVM section

 * @features: hw features, any combination of feature_whitelist

 * @pwr_tx_backoffs: translation table between power limits and backoffs
@@ -342,7 +341,6 @@ struct iwl_cfg { 
	const bool internal_wimax_coex;

	const bool host_interrupt_operation_mode;

	bool high_temp;

	bool d0i3;

	u8   nvm_hw_section_num;

	bool lp_xtal_workaround;

	const struct iwl_pwr_tx_backoff *pwr_tx_backoffs;

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+4 −5
Original line number Diff line number Diff line
@@ -916,8 +916,7 @@ iwl_mvm_sta_from_staid_protected(struct iwl_mvm *mvm, u8 sta_id) 


static inline bool iwl_mvm_is_d0i3_supported(struct iwl_mvm *mvm)

{

	return mvm->trans->cfg->d0i3 &&

	       mvm->trans->d0i3_mode != IWL_D0I3_MODE_OFF &&

	return mvm->trans->d0i3_mode != IWL_D0I3_MODE_OFF &&

		!iwlwifi_mod_params.d0i3_disable &&

		fw_has_capa(&mvm->fw->ucode_capa,

			    IWL_UCODE_TLV_CAPA_D0I3_SUPPORT);