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

Commit 9bdfbfad authored by Meenakshi Venkataraman's avatar Meenakshi Venkataraman Committed by John W. Linville
Browse files

iwlwifi: move setting up fw parameters 



Gather parameters required to configure the
transport layer before invoking the transport
configuration API.

Change-Id: I5b39da284af6d9b5432a08911b4e1173a4d7207d
Signed-off-by: default avatarMeenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 92d743ae

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

+24 −21
Original line number Diff line number Diff line
@@ -1206,6 +1206,30 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
	/* TODO: remove fw from shared data later */

	priv->shrd->fw = fw;



	/************************

	 * 2. Setup HW constants

	 ************************/

	iwl_set_hw_params(priv);



	ucode_flags = fw->ucode_capa.flags;



#ifndef CONFIG_IWLWIFI_P2P

	ucode_flags &= ~IWL_UCODE_TLV_FLAGS_PAN;

#endif

	if (!(hw_params(priv).sku & EEPROM_SKU_CAP_IPAN_ENABLE))

		ucode_flags &= ~IWL_UCODE_TLV_FLAGS_PAN;



	/*

	 * if not PAN, then don't support P2P -- might be a uCode

	 * packaging bug or due to the eeprom check above

	 */

	if (!(ucode_flags & IWL_UCODE_TLV_FLAGS_PAN))

		ucode_flags &= ~IWL_UCODE_TLV_FLAGS_P2P;





	/*****************************

	 * Configure transport layer

	 *****************************/

	/*

	 * Populate the state variables that the transport layer needs

	 * to know about.
@@ -1286,27 +1310,6 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
		priv->hw->wiphy->n_addresses++;

	}



	/************************

	 * 5. Setup HW constants

	 ************************/

	iwl_set_hw_params(priv);



	ucode_flags = fw->ucode_capa.flags;



#ifndef CONFIG_IWLWIFI_P2P

	ucode_flags &= ~IWL_UCODE_TLV_FLAGS_PAN;

#endif

	if (!(hw_params(priv).sku & EEPROM_SKU_CAP_IPAN_ENABLE))

		ucode_flags &= ~IWL_UCODE_TLV_FLAGS_PAN;



	/*

	 * if not PAN, then don't support P2P -- might be a uCode

	 * packaging bug or due to the eeprom check above

	 */

	if (!(ucode_flags & IWL_UCODE_TLV_FLAGS_PAN))

		ucode_flags &= ~IWL_UCODE_TLV_FLAGS_P2P;





	/*******************

	 * 6. Setup priv

	 *******************/