Re: iwlagn regression in v3.1.5

[wwguy <wey-yi.w.guy@intel.com>]

[-- Attachment #1: Type: text/plain, Size: 512 bytes --]

Hi Andrej,

Could you try this patch and see any differences.

please still use the same debug flag I ask you last time.

Thanks
Wey

n Mon, 2011-12-12 at 09:15 -0800, Andrej Gelenberg wrote:
> Hi,
> 
> there are broken wlan log and working wlan log and an diff of them.
> 
> Regards,
> Andrej Gelenberg
> 
> On 12/12/2011 02:35 AM, wwguy wrote:
> > Hi Andjej,
> >
> >
> > Could you please load the module with debug=0x1082 and send me the log.
> >
> > $sudo modprobe iwlagn debug=0x1082
> >
> > Thanks
> > Wey


[-- Attachment #2: 0001-iwlwifi-allow-to-switch-to-HT40-if-not-associated-ye.patch --]
[-- Type: text/x-patch, Size: 1094 bytes --]

>From 92e10223b4acf832121f0aa5b4a8d35ebb176f9e Mon Sep 17 00:00:00 2001
From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Date: Tue, 13 Dec 2011 12:13:05 -0800
Subject: [PATCH 1/1] iwlwifi: allow to switch to HT40 if not associated yet

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
---
 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index 36932aa..23548ac 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -610,8 +610,9 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
 			if (ctx->ht.enabled) {
 				/* if HT40 is used, it should not change
 				 * after associated except channel switch */
-				if (iwl_is_associated_ctx(ctx) &&
-				     !ctx->ht.is_40mhz)
+				if ((iwl_is_associated_ctx(ctx) &&
+						!ctx->ht.is_40mhz) ||
+						!iwl_is_associated_ctx(ctx))
 					iwlagn_config_ht40(conf, ctx);
 			} else
 				ctx->ht.is_40mhz = false;
-- 
1.7.0.4