|
John W. Linville |
02606c8 |
From 78feb35b8161acd95c33a703ed6ab6f554d29387 Mon Sep 17 00:00:00 2001
|
|
John W. Linville |
02606c8 |
From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
|
|
John W. Linville |
02606c8 |
Date: Wed, 14 Dec 2011 08:22:36 -0800
|
|
John W. Linville |
02606c8 |
Subject: [PATCH 2/2] iwlwifi: allow to switch to HT40 if not associated
|
|
John W. Linville |
02606c8 |
|
|
 |
5356296 |
My previous patch
|
|
|
5356296 |
34a5b4b6af104cf18eb50748509528b9bdbc4036 iwlwifi: do not re-configure
|
|
|
5356296 |
HT40 after associated
|
|
|
5356296 |
|
|
|
5356296 |
Fix the case of HT40 after association on specified AP, but it break the
|
|
|
5356296 |
association for some APs and cause not able to establish connection.
|
|
|
5356296 |
We need to address HT40 before and after addociation.
|
|
|
5356296 |
|
|
|
5356296 |
CC: stable@vger.kernel.org #3.0+
|
|
|
5356296 |
Reported-by: Andrej Gelenberg <andrej.gelenberg@udo.edu>
|
|
|
5356296 |
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
|
|
|
5356296 |
Tested-by: Andrej Gelenberg <andrej.gelenberg@udo.edu>
|
|
John W. Linville |
02606c8 |
Signed-off-by: John W. Linville <linville@tuxdriver.com>
|
|
|
5356296 |
---
|
|
|
5356296 |
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 4 ++--
|
|
|
5356296 |
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
5356296 |
|
|
|
5356296 |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
|
|
|
5356296 |
index a7a6def..5c7c17c 100644
|
|
|
5356296 |
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
|
|
|
5356296 |
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
|
|
|
5356296 |
@@ -606,8 +606,8 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
|
|
|
5356296 |
if (ctx->ht.enabled) {
|
|
|
5356296 |
/* if HT40 is used, it should not change
|
|
|
5356296 |
* after associated except channel switch */
|
|
|
5356296 |
- if (iwl_is_associated_ctx(ctx) &&
|
|
|
5356296 |
- !ctx->ht.is_40mhz)
|
|
|
5356296 |
+ if (!ctx->ht.is_40mhz ||
|
|
|
5356296 |
+ !iwl_is_associated_ctx(ctx))
|
|
|
5356296 |
iwlagn_config_ht40(conf, ctx);
|
|
|
5356296 |
} else
|
|
|
5356296 |
ctx->ht.is_40mhz = false;
|
|
|
5356296 |
--
|
|
John W. Linville |
02606c8 |
1.7.4.4
|
|
|
5356296 |
|