Commit 9fc38458 authored by Michael Buesch's avatar Michael Buesch Committed by John W. Linville

b43: Add more btcoexist workarounds

This adds more workarounds for devices with broken BT bits.
Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a259d6a4
...@@ -4423,6 +4423,12 @@ static int b43_one_core_attach(struct ssb_device *dev, struct b43_wl *wl) ...@@ -4423,6 +4423,12 @@ static int b43_one_core_attach(struct ssb_device *dev, struct b43_wl *wl)
return err; return err;
} }
#define IS_PDEV(pdev, _vendor, _device, _subvendor, _subdevice) ( \
(pdev->vendor == PCI_VENDOR_ID_##_vendor) && \
(pdev->device == _device) && \
(pdev->subsystem_vendor == PCI_VENDOR_ID_##_subvendor) && \
(pdev->subsystem_device == _subdevice) )
static void b43_sprom_fixup(struct ssb_bus *bus) static void b43_sprom_fixup(struct ssb_bus *bus)
{ {
struct pci_dev *pdev; struct pci_dev *pdev;
...@@ -4436,10 +4442,9 @@ static void b43_sprom_fixup(struct ssb_bus *bus) ...@@ -4436,10 +4442,9 @@ static void b43_sprom_fixup(struct ssb_bus *bus)
bus->sprom.boardflags_lo |= B43_BFL_PACTRL; bus->sprom.boardflags_lo |= B43_BFL_PACTRL;
if (bus->bustype == SSB_BUSTYPE_PCI) { if (bus->bustype == SSB_BUSTYPE_PCI) {
pdev = bus->host_pci; pdev = bus->host_pci;
if (pdev->vendor == PCI_VENDOR_ID_BROADCOM && if (IS_PDEV(pdev, BROADCOM, 0x4318, ASUSTEK, 0x100F) ||
pdev->device == 0x4318 && IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0015) ||
pdev->subsystem_vendor == PCI_VENDOR_ID_ASUSTEK && IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0013))
pdev->subsystem_device == 0x100F)
bus->sprom.boardflags_lo &= ~B43_BFL_BTCOEXIST; bus->sprom.boardflags_lo &= ~B43_BFL_BTCOEXIST;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment