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>

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index 29d38b938f385c724afe2fc28d5119b55533bfbb..0a71bb55d0ee083207cfc1e49b97b0df042858f4 100644 (file)
--- 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,
        tbl->action = 0;
        rate_mask = lq_sta->active_mimo2_rate;
 
-       if (priv->current_ht_config.supported_chan_width
-                                       == IWL_CHANNEL_WIDTH_40MHZ)
+       if (iwl_is_fat_tx_allowed(priv, &sta->ht_cap))
                tbl->is_fat = 1;
        else
                tbl->is_fat = 0;
@@ -1273,8 +1272,7 @@ static int rs_switch_to_mimo3(struct iwl_priv *priv,
        tbl->action = 0;
        rate_mask = lq_sta->active_mimo3_rate;
 
-       if (priv->current_ht_config.supported_chan_width
-                                       == IWL_CHANNEL_WIDTH_40MHZ)
+       if (iwl_is_fat_tx_allowed(priv, &sta->ht_cap))
                tbl->is_fat = 1;
        else
                tbl->is_fat = 0;
@@ -1332,8 +1330,7 @@ static int rs_switch_to_siso(struct iwl_priv *priv,
        tbl->action = 0;
        rate_mask = lq_sta->active_siso_rate;
 
-       if (priv->current_ht_config.supported_chan_width
-           == IWL_CHANNEL_WIDTH_40MHZ)
+       if (iwl_is_fat_tx_allowed(priv, &sta->ht_cap))
                tbl->is_fat = 1;
        else
                tbl->is_fat = 0;