summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@googlemail.com>2010-07-16 13:01:24 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-07-16 14:03:42 -0400
commit15804e3e9de52f1baefad34233424488b5672853 (patch)
tree997ab099257837a0ff0e246dd715e2738381239a /net/mac80211
parent9edd9520a2c664c6d72dca68adddd243d00006e8 (diff)
downloadblackbird-op-linux-15804e3e9de52f1baefad34233424488b5672853.tar.gz
blackbird-op-linux-15804e3e9de52f1baefad34233424488b5672853.zip
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>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/ht.c2
1 files changed, 1 insertions, 1 deletions
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;
OpenPOWER on IntegriCloud