From patchwork Sun Aug 16 16:42:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?G=C3=A1bor_Stefanik?= X-Patchwork-Id: 41795 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 n7GGgvIt022107 for ; Sun, 16 Aug 2009 16:42:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751698AbZHPQmy (ORCPT ); Sun, 16 Aug 2009 12:42:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751822AbZHPQmy (ORCPT ); Sun, 16 Aug 2009 12:42:54 -0400 Received: from mail-bw0-f222.google.com ([209.85.218.222]:36597 "EHLO mail-bw0-f222.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751573AbZHPQmx (ORCPT ); Sun, 16 Aug 2009 12:42:53 -0400 Received: by bwz22 with SMTP id 22so1915429bwz.18 for ; Sun, 16 Aug 2009 09:42:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=rwsI2rYr5QwJyzqNozBa1TlKtx9mnu+RT4CZ5kwOL5Q=; b=WehzyZ+Zg5rv+BmTWqZgWm1937A4Y5GcxXIajc9417hNjePUN/FKMSVunD2F/a3u+P gm4LVCRT7Y3Jcf/8b3MZCP6QrYPKcCULOiN36ONzKYNZKACD88OPG9n/WuAjmuRPD+M3 w/yYv0nnh2kfGOIvlJpu+dIpemjNdj0FDmRmM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=gbJlNNnmt4X0w76KtHFv6HtbCedWg6NcCldDt9AYq4L7etUdMidUl25b3+sOq0LcR9 aJYdk05Is6LG95lfS+OueTAzE2x3wFL0MoEemOKDb2oyk7a29SKUSQQ8++yPnT0mSE9t Ti8vQH9lLc5ypsjK9zhJAk8K40/yg4KfKlDTw= Received: by 10.103.251.20 with SMTP id d20mr1016761mus.42.1250440973262; Sun, 16 Aug 2009 09:42:53 -0700 (PDT) Received: from ?192.168.1.3? (pool-053ee.externet.hu [92.52.200.237]) by mx.google.com with ESMTPS id e8sm15411747muf.6.2009.08.16.09.42.52 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 16 Aug 2009 09:42:52 -0700 (PDT) Message-ID: <4A88370B.5090506@gmail.com> Date: Sun, 16 Aug 2009 18:42:51 +0200 From: =?UTF-8?B?R8OhYm9yIFN0ZWZhbmlr?= User-Agent: Thunderbird 2.0.0.22 (Windows/20090605) MIME-Version: 1.0 To: John Linville , Michael Buesch , Larry Finger CC: Mark Huijgen , Broadcom Wireless , linux-wireless Subject: [PATCH] b43: LP-PHY: Remove BROKEN from B43_PHY_LP Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Larry has reported success getting scan data with an LP-PHY device, so it's probably time to release LP-PHY support for testing. Also add a temporary BROKEN Kconfig symbol to disable 5GHz support, as 5GHz currently causes the driver to panic (NULL pointer deref). Signed-off-by: Gábor Stefanik --- drivers/net/wireless/b43/Kconfig | 25 +++++++++++++++++++------ drivers/net/wireless/b43/main.c | 2 ++ drivers/net/wireless/b43/phy_lp.c | 2 ++ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig index 67f564e..13414c9 100644 --- a/drivers/net/wireless/b43/Kconfig +++ b/drivers/net/wireless/b43/Kconfig @@ -80,16 +80,29 @@ config B43_NPHY SAY N. config B43_PHY_LP - bool "IEEE 802.11g LP-PHY support (BROKEN)" - depends on B43 && EXPERIMENTAL && BROKEN + bool "Support for low-power (LP-PHY) devices (VERY EXPERIMENTAL)" + depends on B43 && EXPERIMENTAL ---help--- Support for the LP-PHY. - The LP-PHY is an IEEE 802.11g based PHY built into some notebooks - and embedded devices. + The LP-PHY is a low-power PHY built into some notebooks + and embedded devices. It supports 802.11a/g + (802.11a support is optional, and currently disabled). - THIS IS BROKEN AND DOES NOT WORK YET. + Known LP-PHY devices include the BCM4310, BCM4312 (PCI ID 0x4315), + BCM4325 (currently unsupported), BCM4326 & BCM4328 wireless cards + and the BCM5354 SoC. - SAY N. + This is heavily experimental, and probably will not work for you. + Say N unless you want to help debug the driver. + +config B43_PHY_LP_5GHZ + bool "Enable 802.11a support for LP-PHYs (BROKEN)" + depends on B43_PHY_LP && BROKEN + ---help--- + Enable the 5GHz band of LP-PHY devices. Currently, all it + does is cause the driver to panic on startup. + + Only select this if you are a developer working on this feature. # This config option automatically enables b43 LEDS support, # if it's possible. diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 99b41ce..0096d25 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -4514,7 +4514,9 @@ static int b43_wireless_core_attach(struct b43_wldev *dev) have_5ghz_phy = 1; break; case B43_PHYTYPE_LP: //FIXME not always! +#ifdef CONFIG_B43_PHY_LP_5GHZ have_5ghz_phy = 1; +#endif case B43_PHYTYPE_G: case B43_PHYTYPE_N: have_2ghz_phy = 1; diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c index 3889519..c902dd1 100644 --- a/drivers/net/wireless/b43/phy_lp.c +++ b/drivers/net/wireless/b43/phy_lp.c @@ -43,7 +43,9 @@ static inline u16 channel2freq_lp(u8 channel) static unsigned int b43_lpphy_op_get_default_chan(struct b43_wldev *dev) { +#ifdef CONFIG_B43_PHY_LP_5GHZ if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) +#endif return 1; return 36; }