From patchwork Thu Sep 3 06:38:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sujith X-Patchwork-Id: 45311 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n836RhoZ006944 for ; Thu, 3 Sep 2009 06:27:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754652AbZICG1S (ORCPT ); Thu, 3 Sep 2009 02:27:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754573AbZICG1S (ORCPT ); Thu, 3 Sep 2009 02:27:18 -0400 Received: from mail.atheros.com ([12.36.123.2]:58435 "EHLO mail.atheros.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754513AbZICG1S (ORCPT ); Thu, 3 Sep 2009 02:27:18 -0400 Received: from mail.atheros.com ([10.10.20.105]) by sidewinder.atheros.com for ; Wed, 02 Sep 2009 23:27:21 -0700 Received: from CHEXHC-01.global.atheros.com (10.12.0.100) by SC1EXHC-01.global.atheros.com (10.10.20.105) with Microsoft SMTP Server (TLS) id 8.0.751.0; Wed, 2 Sep 2009 23:27:20 -0700 Received: from neuromancer (10.12.4.103) by CHEXHC-01.global.atheros.com (10.12.0.100) with Microsoft SMTP Server (TLS) id 8.0.751.0; Thu, 3 Sep 2009 11:57:16 +0530 From: Sujith MIME-Version: 1.0 Message-ID: <19103.25725.707217.596352@gargle.gargle.HOWL> Date: Thu, 3 Sep 2009 12:08:53 +0530 To: X-Mailer: VM 8.0.12 under 23.1.1 (x86_64-unknown-linux-gnu) CC: Subject: [PATCH 2/2] ath9k: Fix channelFlags for 2GHZ Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org CHANNEL_G has to be set for 2GHZ channels since IS_CHAN_G() checks for this in channelFlags and not in chanmode. To make things messier, ath9k_hw_process_ini() checks for CHANNEL_G in chanmode and not in channelFlags. The supreme, brain-searing fix is to set the flag in both cases. Signed-off-by: Sujith --- drivers/net/wireless/ath/ath9k/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index b1d189c..a69fda8 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -1879,7 +1879,7 @@ void ath9k_update_ichannel(struct ath_softc *sc, struct ieee80211_hw *hw, if (chan->band == IEEE80211_BAND_2GHZ) { ichan->chanmode = CHANNEL_G; - ichan->channelFlags = CHANNEL_2GHZ | CHANNEL_OFDM; + ichan->channelFlags = CHANNEL_2GHZ | CHANNEL_OFDM | CHANNEL_G; } else { ichan->chanmode = CHANNEL_A; ichan->channelFlags = CHANNEL_5GHZ | CHANNEL_OFDM;