2 files changed, 6 insertions, 3 deletions

diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 2969f74faa42..657841da740b 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -578,9 +578,9 @@ mwifiex_dump_station_info(struct mwifiex_private *priv,
 
         /*
          * Bit 0 in tx_htinfo indicates that current Tx rate is 11n rate. Valid
-         * MCS index values for us are 0 to 7.
+         * MCS index values for us are 0 to 15.
          */
-        if ((priv->tx_htinfo & BIT(0)) && (priv->tx_rate < 8)) {
+        if ((priv->tx_htinfo & BIT(0)) && (priv->tx_rate < 16)) {
                 sinfo->txrate.mcs = priv->tx_rate;
                 sinfo->txrate.flags |= RATE_INFO_FLAGS_MCS;
                 /* 40MHz rate */
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index cf7bdc66f822..224e03ade145 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -1665,7 +1665,9 @@ mwl8k_txq_reclaim(struct ieee80211_hw *hw, int index, int limit, int force)
 
                 info = IEEE80211_SKB_CB(skb);
                 if (ieee80211_is_data(wh->frame_control)) {
-                        sta = info->control.sta;
+                        rcu_read_lock();
+                        sta = ieee80211_find_sta_by_ifaddr(hw, wh->addr1,
+                                                           wh->addr2);
                         if (sta) {
                                 sta_info = MWL8K_STA(sta);
                                 BUG_ON(sta_info == NULL);
@@ -1682,6 +1684,7 @@ mwl8k_txq_reclaim(struct ieee80211_hw *hw, int index, int limit, int force)
                                         sta_info->is_ampdu_allowed = true;
                                 }
                         }
+                        rcu_read_unlock();
                 }
 
                 ieee80211_tx_info_clear_status(info);