diff --git a/[refs] b/[refs]
index 294c85509c42..1f4fd4bc516a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9edd9520a2c664c6d72dca68adddd243d00006e8
+refs/heads/master: 15804e3e9de52f1baefad34233424488b5672853
diff --git a/trunk/net/mac80211/ht.c b/trunk/net/mac80211/ht.c
index be928ef7ef51..9d101fb33861 100644
--- a/trunk/net/mac80211/ht.c
+++ b/trunk/net/mac80211/ht.c
@@ -29,7 +29,7 @@ void ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_supported_band *sband,
 
 	memset(ht_cap, 0, sizeof(*ht_cap));
 
-	if (!ht_cap_ie)
+	if (!ht_cap_ie || !sband->ht_cap.ht_supported)
 		return;
 
 	ht_cap->ht_supported = true;