From patchwork Mon Jan 10 21:04:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arik Nemtsov X-Patchwork-Id: 469641 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0AL50a5020463 for ; Mon, 10 Jan 2011 21:05:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754133Ab1AJVE5 (ORCPT ); Mon, 10 Jan 2011 16:04:57 -0500 Received: from mail-ww0-f44.google.com ([74.125.82.44]:60298 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754113Ab1AJVE5 (ORCPT ); Mon, 10 Jan 2011 16:04:57 -0500 Received: by wwa36 with SMTP id 36so1049916wwa.1 for ; Mon, 10 Jan 2011 13:04:54 -0800 (PST) Received: by 10.227.154.213 with SMTP id p21mr18998270wbw.41.1294693447162; Mon, 10 Jan 2011 13:04:07 -0800 (PST) Received: from localhost.localdomain (93-172-22-211.bb.netvision.net.il [93.172.22.211]) by mx.google.com with ESMTPS id r38sm14324976weq.23.2011.01.10.13.04.04 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 10 Jan 2011 13:04:06 -0800 (PST) From: Arik Nemtsov To: Cc: Luciano Coelho , Arik Nemtsov Subject: [PATCH] wl12xx: reset 5ghz num channels on hw init Date: Mon, 10 Jan 2011 23:04:04 +0200 Message-Id: <1294693444-30807-1-git-send-email-arik@wizery.com> X-Mailer: git-send-email 1.7.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 10 Jan 2011 21:05:00 +0000 (UTC) diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 062247e..44cdefd 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c @@ -2679,6 +2679,10 @@ int wl1271_init_ieee80211(struct wl1271 *wl) wl->hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &wl1271_band_2ghz; wl->hw->wiphy->bands[IEEE80211_BAND_5GHZ] = &wl1271_band_5ghz; + /* reset the number of channels as this can be changed at runtime */ + wl->hw->wiphy->bands[IEEE80211_BAND_5GHZ]->n_channels = + ARRAY_SIZE(wl1271_channels_5ghz); + wl->hw->queues = 4; wl->hw->max_rates = 1;