package/kernel/mac80211/patches/383-b43-fix-support-for-14e4-4321-PCI-dev-with-BCM4321-c.patch

   1 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
   2 Date: Sat, 6 Jun 2015 22:45:59 +0200
   3 Subject: [PATCH] b43: fix support for 14e4:4321 PCI dev with BCM4321 chipset
   4 MIME-Version: 1.0
   5 Content-Type: text/plain; charset=UTF-8
   6 Content-Transfer-Encoding: 8bit
   7
   8 It seems Broadcom released two devices with conflicting device id. There
   9 are for sure 14e4:4321 PCI devices with BCM4321 (N-PHY) chipset, they
  10 can be found in routers, e.g. Netgear WNR834Bv2. However, according to
  11 Broadcom public sources 0x4321 is also used for 5 GHz BCM4306 (G-PHY).
  12 It's unsure if they meant PCI device id, or "virtual" id (from SPROM).
  13 To distinguish these devices lets check PHY type (G vs. N).
  14
  15 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  16 Cc: <stable@vger.kernel.org> # 3.16+
  17 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  18 ---
  19
  20 --- a/drivers/net/wireless/b43/main.c
  21 +++ b/drivers/net/wireless/b43/main.c
  22 @@ -5365,6 +5365,10 @@ static void b43_supported_bands(struct b
  23                 *have_5ghz_phy = true;
  24                 return;
  25         case 0x4321: /* BCM4306 */
  26 +               /* There are 14e4:4321 PCI devs with 2.4 GHz BCM4321 (N-PHY) */
  27 +               if (dev->phy.type != B43_PHYTYPE_G)
  28 +                       break;
  29 +               /* fall through */
  30         case 0x4313: /* BCM4311 */
  31         case 0x431a: /* BCM4318 */
  32         case 0x432a: /* BCM4321 */