From patchwork Tue Dec 13 20:15:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guy, Wey-Yi" X-Patchwork-Id: 131185 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1C6121007D3 for ; Wed, 14 Dec 2011 07:22:38 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755939Ab1LMUWP (ORCPT ); Tue, 13 Dec 2011 15:22:15 -0500 Received: from mga02.intel.com ([134.134.136.20]:19410 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755780Ab1LMUWO (ORCPT ); Tue, 13 Dec 2011 15:22:14 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 13 Dec 2011 12:22:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,351,1309762800"; d="scan'208,223";a="86885949" Received: from wwguy-ubuntu.jf.intel.com (HELO [134.134.163.140]) ([134.134.163.140]) by orsmga002.jf.intel.com with ESMTP; 13 Dec 2011 12:22:14 -0800 Subject: Re: iwlagn regression in v3.1.5 From: wwguy To: Andrej Gelenberg Cc: Udo Steinberg , Intel Linux Wireless , "John W. Linville" , "linux-wireless@vger.kernel.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" In-Reply-To: <4EE636B9.1020305@udo.edu> References: <4EE4AEF4.2080702@udo.edu> <4EE4DB55.4090804@udo.edu> <20111211174138.79e51fe8@x220.fritz.box> <4EE4E152.2070204@udo.edu> <1323627815.1806.19.camel@wwguy-ubuntu> <4EE50266.4050208@udo.edu> <1323653737.1806.21.camel@wwguy-ubuntu> <4EE636B9.1020305@udo.edu> Date: Tue, 13 Dec 2011 12:15:27 -0800 Message-ID: <1323807327.7144.6.camel@wwguy-ubuntu> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 From 92e10223b4acf832121f0aa5b4a8d35ebb176f9e Mon Sep 17 00:00:00 2001 From: Wey-Yi Guy 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 --- 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