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

Commit da154e30 authored by Ron Rindjunsky's avatar Ron Rindjunsky Committed by John W. Linville
Browse files

iwlwifi: unite common settings of HW params 



This patch unites common settings of 4965 and 5000 hw params.

Signed-off-by: default avatarRon Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3bff19c2

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

+0 −9
Original line number Diff line number Diff line
@@ -837,17 +837,8 @@ static int iwl4965_hw_set_hw_params(struct iwl_priv *priv) 


	priv->hw_params.max_txq_num = priv->cfg->mod_params->num_of_queues;

	priv->hw_params.first_ampdu_q = IWL49_FIRST_AMPDU_QUEUE;

	priv->hw_params.sw_crypto = priv->cfg->mod_params->sw_crypto;

	priv->hw_params.max_rxq_size = RX_QUEUE_SIZE;

	priv->hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG;

	if (priv->cfg->mod_params->amsdu_size_8K)

		priv->hw_params.rx_buf_size = IWL_RX_BUF_SIZE_8K;

	else

		priv->hw_params.rx_buf_size = IWL_RX_BUF_SIZE_4K;

	priv->hw_params.max_pkt_size = priv->hw_params.rx_buf_size - 256;

	priv->hw_params.max_stations = IWL4965_STATION_COUNT;

	priv->hw_params.bcast_sta_id = IWL4965_BROADCAST_ID;



	priv->hw_params.max_data_size = IWL49_RTC_DATA_SIZE;

	priv->hw_params.max_inst_size = IWL49_RTC_INST_SIZE;

	priv->hw_params.max_bsm_size = BSM_SRAM_SIZE;

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

+1 −9
Original line number Diff line number Diff line
@@ -827,19 +827,11 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv) 


	priv->hw_params.max_txq_num = priv->cfg->mod_params->num_of_queues;

	priv->hw_params.first_ampdu_q = IWL50_FIRST_AMPDU_QUEUE;

	priv->hw_params.sw_crypto = priv->cfg->mod_params->sw_crypto;

	priv->hw_params.max_rxq_size = RX_QUEUE_SIZE;

	priv->hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG;

	if (priv->cfg->mod_params->amsdu_size_8K)

		priv->hw_params.rx_buf_size = IWL_RX_BUF_SIZE_8K;

	else

		priv->hw_params.rx_buf_size = IWL_RX_BUF_SIZE_4K;

	priv->hw_params.max_pkt_size = priv->hw_params.rx_buf_size - 256;

	priv->hw_params.max_stations = IWL5000_STATION_COUNT;

	priv->hw_params.bcast_sta_id = IWL5000_BROADCAST_ID;

	priv->hw_params.max_data_size = IWL50_RTC_DATA_SIZE;

	priv->hw_params.max_inst_size = IWL50_RTC_INST_SIZE;

	priv->hw_params.max_bsm_size = BSM_SRAM_SIZE;

	priv->hw_params.max_bsm_size = 0;

	priv->hw_params.fat_channel =  BIT(IEEE80211_BAND_2GHZ) |

					BIT(IEEE80211_BAND_5GHZ);

	priv->hw_params.sens = &iwl5000_sensitivity;

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

+15 −0
Original line number Diff line number Diff line
@@ -842,6 +842,21 @@ int iwl_setup_mac(struct iwl_priv *priv) 
}

EXPORT_SYMBOL(iwl_setup_mac);



int iwl_set_hw_params(struct iwl_priv *priv)

{

	priv->hw_params.sw_crypto = priv->cfg->mod_params->sw_crypto;

	priv->hw_params.max_rxq_size = RX_QUEUE_SIZE;

	priv->hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG;

	if (priv->cfg->mod_params->amsdu_size_8K)

		priv->hw_params.rx_buf_size = IWL_RX_BUF_SIZE_8K;

	else

		priv->hw_params.rx_buf_size = IWL_RX_BUF_SIZE_4K;

	priv->hw_params.max_pkt_size = priv->hw_params.rx_buf_size - 256;



	/* Device-specific setup */

	return priv->cfg->ops->lib->set_hw_params(priv);

}

EXPORT_SYMBOL(iwl_set_hw_params);



int iwl_init_drv(struct iwl_priv *priv)

{

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

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ u8 iwl_is_fat_tx_allowed(struct iwl_priv *priv, 
			 struct ieee80211_ht_info *sta_ht_inf);

int iwl_hw_nic_init(struct iwl_priv *priv);

int iwl_setup_mac(struct iwl_priv *priv);

int iwl_set_hw_params(struct iwl_priv *priv);

int iwl_init_drv(struct iwl_priv *priv);

void iwl_uninit_drv(struct iwl_priv *priv);

/* "keep warm" functions */

drivers/net/wireless/iwlwifi/iwl4965-base.c

+1 −2
Original line number Diff line number Diff line
@@ -4243,8 +4243,7 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e 
	/************************

	 * 5. Setup HW constants

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

	/* Device-specific setup */

	if (priv->cfg->ops->lib->set_hw_params(priv)) {

	if (iwl_set_hw_params(priv)) {

		IWL_ERROR("failed to set hw parameters\n");

		goto out_free_eeprom;

	}