aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
diff options
context:
space:
mode:
authorWinkler, Tomas <tomas.winkler@intel.com>2008-12-18 21:37:33 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 15:59:17 -0500
commit15b1687cb4f45b87ddbe4dfc7759ff5bb69497d2 (patch)
treec4e3e70b0d9b7ba877e52cd0a5116c4411bbf8e1 /drivers/net/wireless/iwlwifi/iwl-agn-rs.c
parent39aadf8c29ad959e823efca15381bea9d0770b1e (diff)
iwlwifi: replace IWL_ERROR with IWL_ERR
IWL_ERR doesn't use hidden priv pointer. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-rs.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-rs.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index c0f8b96b9f8b..75b418e5e874 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -1431,7 +1431,8 @@ static int rs_move_siso_to_other(struct iwl_priv *priv,
1431 if (!tbl->is_SGI) 1431 if (!tbl->is_SGI)
1432 break; 1432 break;
1433 else 1433 else
1434 IWL_ERROR("SGI was set in GF+SISO\n"); 1434 IWL_ERR(priv,
1435 "SGI was set in GF+SISO\n");
1435 } 1436 }
1436 search_tbl->is_SGI = !tbl->is_SGI; 1437 search_tbl->is_SGI = !tbl->is_SGI;
1437 rs_set_expected_tpt_table(lq_sta, search_tbl); 1438 rs_set_expected_tpt_table(lq_sta, search_tbl);
@@ -1748,13 +1749,13 @@ static void rs_rate_scale_perform(struct iwl_priv *priv,
1748 rate_scale_index_msk = rate_mask; 1749 rate_scale_index_msk = rate_mask;
1749 1750
1750 if (!((1 << index) & rate_scale_index_msk)) { 1751 if (!((1 << index) & rate_scale_index_msk)) {
1751 IWL_ERROR("Current Rate is not valid\n"); 1752 IWL_ERR(priv, "Current Rate is not valid\n");
1752 return; 1753 return;
1753 } 1754 }
1754 1755
1755 /* Get expected throughput table and history window for current rate */ 1756 /* Get expected throughput table and history window for current rate */
1756 if (!tbl->expected_tpt) { 1757 if (!tbl->expected_tpt) {
1757 IWL_ERROR("tbl->expected_tpt is NULL\n"); 1758 IWL_ERR(priv, "tbl->expected_tpt is NULL\n");
1758 return; 1759 return;
1759 } 1760 }
1760 1761