From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:48140 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751932AbbFZFkG (ORCPT ); Fri, 26 Jun 2015 01:40:06 -0400 Subject: Patch "b43: fix support for 14e4:4321 PCI dev with BCM4321 chipset" has been added to the 4.1-stable tree To: zajec5@gmail.com, gregkh@linuxfoundation.org, kvalo@codeaurora.org, stable@vger.kernel.org Cc: , From: Date: Thu, 25 Jun 2015 21:24:09 -0700 Message-ID: <143529264916524@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled b43: fix support for 14e4:4321 PCI dev with BCM4321 chipset to the 4.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: b43-fix-support-for-14e4-4321-pci-dev-with-bcm4321-chipset.patch and it can be found in the queue-4.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 90f91b129810c3f169e443252be30ed7c0130326 Mon Sep 17 00:00:00 2001 From: Rafał Miłecki Date: Sat, 6 Jun 2015 22:45:59 +0200 Subject: b43: fix support for 14e4:4321 PCI dev with BCM4321 chipset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Rafał Miłecki commit 90f91b129810c3f169e443252be30ed7c0130326 upstream. It seems Broadcom released two devices with conflicting device id. There are for sure 14e4:4321 PCI devices with BCM4321 (N-PHY) chipset, they can be found in routers, e.g. Netgear WNR834Bv2. However, according to Broadcom public sources 0x4321 is also used for 5 GHz BCM4306 (G-PHY). It's unsure if they meant PCI device id, or "virtual" id (from SPROM). To distinguish these devices lets check PHY type (G vs. N). Signed-off-by: Rafał Miłecki Cc: # 3.16+ Signed-off-by: Kalle Valo Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/b43/main.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -5365,6 +5365,10 @@ static void b43_supported_bands(struct b *have_5ghz_phy = true; return; case 0x4321: /* BCM4306 */ + /* There are 14e4:4321 PCI devs with 2.4 GHz BCM4321 (N-PHY) */ + if (dev->phy.type != B43_PHYTYPE_G) + break; + /* fall through */ case 0x4313: /* BCM4311 */ case 0x431a: /* BCM4318 */ case 0x432a: /* BCM4321 */ Patches currently in stable-queue which might be from zajec5@gmail.com are queue-4.1/b43-fix-support-for-14e4-4321-pci-dev-with-bcm4321-chipset.patch