Commit 7d34a7d7 authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: always access the trans configuration via trans 



Stop accessing the trans configuration via the iwl_cfg structure and
always access it via the iwl_trans structure.  This completes the
requirements to disassociate the trans-specific configuration from the
rest of the configuration.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent d8913b80

drivers/net/wireless/intel/iwlwifi/dvm/devices.c

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ static void iwl6000_set_ct_threshold(struct iwl_priv *priv) 
/* NIC configuration for 6000 series */

static void iwl6000_nic_config(struct iwl_priv *priv)

{

	switch (priv->cfg->trans.device_family) {

	switch (priv->trans->trans_cfg->device_family) {

	case IWL_DEVICE_FAMILY_6005:

	case IWL_DEVICE_FAMILY_6030:

	case IWL_DEVICE_FAMILY_6000:

drivers/net/wireless/intel/iwlwifi/dvm/led.c

+2 −2
Original line number Diff line number Diff line
@@ -121,9 +121,9 @@ static int iwl_led_cmd(struct iwl_priv *priv, 
	}



	led_cmd.on = iwl_blink_compensation(priv, on,

				priv->cfg->trans.base_params->led_compensation);

				priv->trans->trans_cfg->base_params->led_compensation);

	led_cmd.off = iwl_blink_compensation(priv, off,

				priv->cfg->trans.base_params->led_compensation);

				priv->trans->trans_cfg->base_params->led_compensation);



	ret = iwl_send_led_cmd(priv, &led_cmd);

	if (!ret) {

drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c

+1 −1
Original line number Diff line number Diff line
@@ -1099,7 +1099,7 @@ static void iwlagn_mac_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
		goto done;

	}



	scd_queues = BIT(priv->cfg->trans.base_params->num_of_queues) - 1;

	scd_queues = BIT(priv->trans->trans_cfg->base_params->num_of_queues) - 1;

	scd_queues &= ~(BIT(IWL_IPAN_CMD_QUEUE_NUM) |

			BIT(IWL_DEFAULT_CMD_QUEUE_NUM));

drivers/net/wireless/intel/iwlwifi/dvm/main.c

+5 −5
Original line number Diff line number Diff line
@@ -1267,7 +1267,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
	priv->cfg = cfg;

	priv->fw = fw;



	switch (priv->cfg->trans.device_family) {

	switch (priv->trans->trans_cfg->device_family) {

	case IWL_DEVICE_FAMILY_1000:

	case IWL_DEVICE_FAMILY_100:

		priv->lib = &iwl_dvm_1000_cfg;
@@ -1342,7 +1342,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
					  driver_data[2]);



	WARN_ON(sizeof(priv->transport_queue_stop) * BITS_PER_BYTE <

		priv->cfg->trans.base_params->num_of_queues);

		priv->trans->trans_cfg->base_params->num_of_queues);



	ucode_flags = fw->ucode_capa.flags;
@@ -1405,7 +1405,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
	/* Reset chip to save power until we load uCode during "up". */

	iwl_trans_stop_device(priv->trans);



	priv->nvm_data = iwl_parse_eeprom_data(priv->trans->dev, priv->cfg,

	priv->nvm_data = iwl_parse_eeprom_data(priv->trans, priv->cfg,

					       priv->eeprom_blob,

					       priv->eeprom_blob_size);

	if (!priv->nvm_data)

drivers/net/wireless/intel/iwlwifi/dvm/power.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static void iwl_static_sleep_cmd(struct iwl_priv *priv, 
	else

		cmd->flags &= ~IWL_POWER_SLEEP_OVER_DTIM_MSK;



	if (priv->cfg->trans.base_params->shadow_reg_enable)

	if (priv->trans->trans_cfg->base_params->shadow_reg_enable)

		cmd->flags |= IWL_POWER_SHADOW_REG_ENA;

	else

		cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA;

CRA Git | Maintained and supported by SUSTech CRA and CCSE