aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2009-04-30 16:56:28 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-05-06 15:15:00 -0400
commita30199f129e17998f802d3307907560431e78493 (patch)
treef2e873738a23908baad60c66eebe599c39587c99 /drivers
parent286d94906587901851906a5e2ddc09bc1a7ba1d9 (diff)
iwlwifi: "is_fat" bit in rate scale match RXON flag
This patch change the "is_fat" checking in rate scale to use iwl_is_fat_tx_allowed() to match the sta and RX_ON command setting. Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Tested-by: Conrad Kostecki <ConiKost@gmx.de> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-rs.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index 29d38b938f38..0a71bb55d0ee 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -1207,8 +1207,7 @@ static int rs_switch_to_mimo2(struct iwl_priv *priv,
1207 tbl->action = 0; 1207 tbl->action = 0;
1208 rate_mask = lq_sta->active_mimo2_rate; 1208 rate_mask = lq_sta->active_mimo2_rate;
1209 1209
1210 if (priv->current_ht_config.supported_chan_width 1210 if (iwl_is_fat_tx_allowed(priv, &sta->ht_cap))
1211 == IWL_CHANNEL_WIDTH_40MHZ)
1212 tbl->is_fat = 1; 1211 tbl->is_fat = 1;
1213 else 1212 else
1214 tbl->is_fat = 0; 1213 tbl->is_fat = 0;
@@ -1273,8 +1272,7 @@ static int rs_switch_to_mimo3(struct iwl_priv *priv,
1273 tbl->action = 0; 1272 tbl->action = 0;
1274 rate_mask = lq_sta->active_mimo3_rate; 1273 rate_mask = lq_sta->active_mimo3_rate;
1275 1274
1276 if (priv->current_ht_config.supported_chan_width 1275 if (iwl_is_fat_tx_allowed(priv, &sta->ht_cap))
1277 == IWL_CHANNEL_WIDTH_40MHZ)
1278 tbl->is_fat = 1; 1276 tbl->is_fat = 1;
1279 else 1277 else
1280 tbl->is_fat = 0; 1278 tbl->is_fat = 0;
@@ -1332,8 +1330,7 @@ static int rs_switch_to_siso(struct iwl_priv *priv,
1332 tbl->action = 0; 1330 tbl->action = 0;
1333 rate_mask = lq_sta->active_siso_rate; 1331 rate_mask = lq_sta->active_siso_rate;
1334 1332
1335 if (priv->current_ht_config.supported_chan_width 1333 if (iwl_is_fat_tx_allowed(priv, &sta->ht_cap))
1336 == IWL_CHANNEL_WIDTH_40MHZ)
1337 tbl->is_fat = 1; 1334 tbl->is_fat = 1;
1338 else 1335 else
1339 tbl->is_fat = 0; 1336 tbl->is_fat = 0;