From d841fe10d986d56ef941b3b1296d249b8828e613 Mon Sep 17 00:00:00 2001 From: Vasanthakumar Thiagarajan Date: Wed, 25 Apr 2012 12:38:18 +0530 Subject: [PATCH] --- yaml --- r: 306736 b: refs/heads/master c: 7fd1ce7eafb8a68d75363e7500433b0ee4392843 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c1c8faca92c2..11a826ce9a77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6251d8012dbc49869f2453942089c4df82de0c80 +refs/heads/master: 7fd1ce7eafb8a68d75363e7500433b0ee4392843 diff --git a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c index f4467733ff5b..3404ef211952 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c @@ -3496,7 +3496,14 @@ int ath6kl_cfg80211_init(struct ath6kl *ar) return -EINVAL; } - if (!ht) { + /* + * Even if the fw has HT support, advertise HT cap only when + * the firmware has support to override RSN capability, otherwise + * 4-way handshake would fail. + */ + if (!(ht && + test_bit(ATH6KL_FW_CAPABILITY_RSN_CAP_OVERRIDE, + ar->fw_capabilities))) { ath6kl_band_2ghz.ht_cap.cap = 0; ath6kl_band_2ghz.ht_cap.ht_supported = false; ath6kl_band_5ghz.ht_cap.cap = 0;