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: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
92d743ae10
commit
9bdfbfadc4
|
@ -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 */
|
/* TODO: remove fw from shared data later */
|
||||||
priv->shrd->fw = fw;
|
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
|
* Populate the state variables that the transport layer needs
|
||||||
* to know about.
|
* 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++;
|
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
|
* 6. Setup priv
|
||||||
*******************/
|
*******************/
|
||||||
|
|
Loading…
Reference in a new issue