Commit 07d4f1ad authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: make iwl_set_hw_params static to _agn 



iwl_set_hw_params() only used by _agn, make it static

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 49ded76b

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

+18 −0
Original line number Diff line number Diff line
@@ -3891,6 +3891,24 @@ static void iwl_hw_detect(struct iwl_priv *priv) 
	IWL_DEBUG_INFO(priv, "HW Revision ID = 0x%X\n", priv->rev_id);

}



static int iwl_set_hw_params(struct iwl_priv *priv)

{

	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_page_order = get_order(IWL_RX_BUF_SIZE_8K);

	else

		priv->hw_params.rx_page_order = get_order(IWL_RX_BUF_SIZE_4K);



	priv->hw_params.max_beacon_itrvl = IWL_MAX_UCODE_BEACON_INTERVAL;



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

		priv->cfg->sku &= ~IWL_SKU_N;



	/* Device-specific setup */

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

}



static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	int err = 0;

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

+0 −19
Original line number Diff line number Diff line
@@ -1365,25 +1365,6 @@ void iwl_configure_filter(struct ieee80211_hw *hw, 
}

EXPORT_SYMBOL(iwl_configure_filter);



int iwl_set_hw_params(struct iwl_priv *priv)

{

	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_page_order = get_order(IWL_RX_BUF_SIZE_8K);

	else

		priv->hw_params.rx_page_order = get_order(IWL_RX_BUF_SIZE_4K);



	priv->hw_params.max_beacon_itrvl = IWL_MAX_UCODE_BEACON_INTERVAL;



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

		priv->cfg->sku &= ~IWL_SKU_N;



	/* Device-specific setup */

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

}

EXPORT_SYMBOL(iwl_set_hw_params);



int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)

{

	int ret = 0;

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

+0 −1
Original line number Diff line number Diff line
@@ -374,7 +374,6 @@ void iwl_irq_handle_error(struct iwl_priv *priv); 
void iwl_configure_filter(struct ieee80211_hw *hw,

			  unsigned int changed_flags,

			  unsigned int *total_flags, u64 multicast);

int iwl_set_hw_params(struct iwl_priv *priv);

void iwl_post_associate(struct iwl_priv *priv, struct ieee80211_vif *vif);

void iwl_bss_info_changed(struct ieee80211_hw *hw,

				     struct ieee80211_vif *vif,