aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2010-07-31 11:34:08 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-16 15:26:38 -0400
commit07d4f1ad2c21273f0f89a3d2202d22fcaf901439 (patch)
treebd54c49d9acba907a9a4dcd50976c53222ee8bc9 /drivers/net
parent49ded76bd52f1341671f767a2f5121cb4eb8cf6e (diff)
iwlwifi: make iwl_set_hw_params static to _agn
iwl_set_hw_params() only used by _agn, make it static Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c18
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c19
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.h1
3 files changed, 18 insertions, 20 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 5c1ea0b2c6a2..8684f2639716 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3891,6 +3891,24 @@ static void iwl_hw_detect(struct iwl_priv *priv)
3891 IWL_DEBUG_INFO(priv, "HW Revision ID = 0x%X\n", priv->rev_id); 3891 IWL_DEBUG_INFO(priv, "HW Revision ID = 0x%X\n", priv->rev_id);
3892} 3892}
3893 3893
3894static int iwl_set_hw_params(struct iwl_priv *priv)
3895{
3896 priv->hw_params.max_rxq_size = RX_QUEUE_SIZE;
3897 priv->hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG;
3898 if (priv->cfg->mod_params->amsdu_size_8K)
3899 priv->hw_params.rx_page_order = get_order(IWL_RX_BUF_SIZE_8K);
3900 else
3901 priv->hw_params.rx_page_order = get_order(IWL_RX_BUF_SIZE_4K);
3902
3903 priv->hw_params.max_beacon_itrvl = IWL_MAX_UCODE_BEACON_INTERVAL;
3904
3905 if (priv->cfg->mod_params->disable_11n)
3906 priv->cfg->sku &= ~IWL_SKU_N;
3907
3908 /* Device-specific setup */
3909 return priv->cfg->ops->lib->set_hw_params(priv);
3910}
3911
3894static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 3912static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
3895{ 3913{
3896 int err = 0; 3914 int err = 0;
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index db8f15f3df46..78882f9ab459 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -1365,25 +1365,6 @@ void iwl_configure_filter(struct ieee80211_hw *hw,
1365} 1365}
1366EXPORT_SYMBOL(iwl_configure_filter); 1366EXPORT_SYMBOL(iwl_configure_filter);
1367 1367
1368int iwl_set_hw_params(struct iwl_priv *priv)
1369{
1370 priv->hw_params.max_rxq_size = RX_QUEUE_SIZE;
1371 priv->hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG;
1372 if (priv->cfg->mod_params->amsdu_size_8K)
1373 priv->hw_params.rx_page_order = get_order(IWL_RX_BUF_SIZE_8K);
1374 else
1375 priv->hw_params.rx_page_order = get_order(IWL_RX_BUF_SIZE_4K);
1376
1377 priv->hw_params.max_beacon_itrvl = IWL_MAX_UCODE_BEACON_INTERVAL;
1378
1379 if (priv->cfg->mod_params->disable_11n)
1380 priv->cfg->sku &= ~IWL_SKU_N;
1381
1382 /* Device-specific setup */
1383 return priv->cfg->ops->lib->set_hw_params(priv);
1384}
1385EXPORT_SYMBOL(iwl_set_hw_params);
1386
1387int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force) 1368int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)
1388{ 1369{
1389 int ret = 0; 1370 int ret = 0;
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index ac16f582d6d3..cca7428c238f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -374,7 +374,6 @@ void iwl_irq_handle_error(struct iwl_priv *priv);
374void iwl_configure_filter(struct ieee80211_hw *hw, 374void iwl_configure_filter(struct ieee80211_hw *hw,
375 unsigned int changed_flags, 375 unsigned int changed_flags,
376 unsigned int *total_flags, u64 multicast); 376 unsigned int *total_flags, u64 multicast);
377int iwl_set_hw_params(struct iwl_priv *priv);
378void iwl_post_associate(struct iwl_priv *priv, struct ieee80211_vif *vif); 377void iwl_post_associate(struct iwl_priv *priv, struct ieee80211_vif *vif);
379void iwl_bss_info_changed(struct ieee80211_hw *hw, 378void iwl_bss_info_changed(struct ieee80211_hw *hw,
380 struct ieee80211_vif *vif, 379 struct ieee80211_vif *vif,