Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	drivers/net/wireless/rtlwifi/rtl8192se/sw.c

1 files changed, 10 insertions, 3 deletions

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 01a21c2f6ab3..2efd595b2f7a 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -318,9 +318,9 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
                         goto err_del_interface;
                 }
 
-                sta_info_move_state(sta, IEEE80211_STA_AUTH);
-                sta_info_move_state(sta, IEEE80211_STA_ASSOC);
-                sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);
+                sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
+                sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
+                sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
 
                 res = sta_info_insert(sta);
                 if (res) {
@@ -1181,6 +1181,13 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
                 sband = local->hw.wiphy->bands[i];
                 sdata->rc_rateidx_mask[i] =
                         sband ? (1 << sband->n_bitrates) - 1 : 0;
+                if (sband)
+                        memcpy(sdata->rc_rateidx_mcs_mask[i],
+                               sband->ht_cap.mcs.rx_mask,
+                               sizeof(sdata->rc_rateidx_mcs_mask[i]));
+                else
+                        memset(sdata->rc_rateidx_mcs_mask[i], 0,
+                               sizeof(sdata->rc_rateidx_mcs_mask[i]));
         }
 
         /* setup type-dependent data */