diff --git a/[refs] b/[refs]
index c77c67e60863..b721b0092261 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cbf9d017dbb5e3276de7d527925d42d4c11e732
+refs/heads/master: 24af717c35189f7a83c34e637256ccb7295a617b
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index b756d2924690..141577412d84 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -647,6 +647,9 @@ static void ieee80211_add_vht_ie(struct ieee80211_sub_if_data *sdata,
 		our_mcs = (le16_to_cpu(vht_cap.vht_mcs.rx_mcs_map) &
 								mask) >> shift;
 
+		if (our_mcs == IEEE80211_VHT_MCS_NOT_SUPPORTED)
+			continue;
+
 		switch (ap_mcs) {
 		default:
 			if (our_mcs <= ap_mcs)