From: Christian Lamparter <chunkeey@googlemail.com>
Date: Fri, 16 Jul 2010 11:01:24 +0000 (+0200)
Subject: mac80211: skip HT parsing if HW does not support HT
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=15804e3e9de52f1baefad34233424488b5672853;p=openwrt%2Fstaging%2Fblogic.git

mac80211: skip HT parsing if HW does not support HT

This patch will also fix the odd freeze which occurred
when minstrel_ht connects to an 802.11n network with
legacy hardware.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index be928ef7ef51..9d101fb33861 100644
--- a/net/mac80211/ht.c
+++ b/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;