mac80211: Fix rate reporting regression

Mattias Nissler's "clean up rate selection" patch incorrectly changes
the behavior of txrate setting in sta_info. This patch backs out parts
of the rate selection consolidation in order to fix this issue for now.

Signed-off-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 14 insertions, 3 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
index 3e812743f6ad..d79f18c41957 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
@@ -657,14 +657,20 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
         struct sta_info *sta;
-        u16 rate_mask;
+        u16 fc, rate_mask;
         struct iwl3945_priv *priv = (struct iwl3945_priv *)priv_rate;
         DECLARE_MAC_BUF(mac);
 
         IWL_DEBUG_RATE("enter\n");
 
         sta = sta_info_get(local, hdr->addr1);
-        if (!sta || !sta->rate_ctrl_priv) {
+
+        /* Send management frames and broadcast/multicast data using lowest
+         * rate. */
+        fc = le16_to_cpu(hdr->frame_control);
+        if ((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA ||
+            is_multicast_ether_addr(hdr->addr1) ||
+            !sta || !sta->rate_ctrl_priv) {
                 IWL_DEBUG_RATE("leave: No STA priv data to update!\n");
                 sel->rate = rate_lowest(local, local->oper_hw_mode, sta);
                 if (sta)
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
index 229b34199f92..5081e287b129 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
@@ -2017,6 +2017,7 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
         struct ieee80211_conf *conf = &local->hw.conf;
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
         struct sta_info *sta;
+        u16 fc;
         struct iwl4965_priv *priv = (struct iwl4965_priv *)priv_rate;
         struct iwl4965_rate_scale_priv *lq;
 
@@ -2024,7 +2025,11 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
 
         sta = sta_info_get(local, hdr->addr1);
 
-        if (!sta || !sta->rate_ctrl_priv) {
+        /* Send management frames and broadcast/multicast data using lowest
+         * rate. */
+        fc = le16_to_cpu(hdr->frame_control);
+        if (!ieee80211_is_data(fc) || is_multicast_ether_addr(hdr->addr1) ||
+            !sta || !sta->rate_ctrl_priv) {
                 sel->rate = rate_lowest(local, local->oper_hw_mode, sta);
                 if (sta)
                         sta_info_put(sta);