Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331
This commit is contained in:
parent
1e1645a527
commit
a20eace265
|
@ -0,0 +1,35 @@
|
|||
Simple patch to remove the overlap between the bcma (i.e. b43) driver
|
||||
and the brcmsmac driver. David Woodhouse <dwmw2@infradead.org>
|
||||
confirmed that this patch restores functionality of bcm4331 devices.
|
||||
|
||||
-- John W. Linville <linville@redhat.com>
|
||||
|
||||
diff -up linux-3.1.x86_64/drivers/bcma/host_pci.c.orig linux-3.1.x86_64/drivers/bcma/host_pci.c
|
||||
--- linux-3.1.x86_64/drivers/bcma/host_pci.c.orig 2011-11-10 11:41:26.829742757 -0500
|
||||
+++ linux-3.1.x86_64/drivers/bcma/host_pci.c 2011-11-10 11:41:22.884792078 -0500
|
||||
@@ -225,11 +225,13 @@ static void bcma_host_pci_remove(struct
|
||||
}
|
||||
|
||||
static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
|
||||
- { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },
|
||||
+#if 0 /* Not in Fedora... */
|
||||
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },
|
||||
+#endif
|
||||
{ 0, },
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pci, bcma_pci_bridge_tbl);
|
||||
diff -up linux-3.1.x86_64/drivers/net/wireless/brcm80211/Kconfig.orig linux-3.1.x86_64/drivers/net/wireless/brcm80211/Kconfig
|
||||
--- linux-3.1.x86_64/drivers/net/wireless/brcm80211/Kconfig.orig 2011-11-10 11:42:31.764930961 -0500
|
||||
+++ linux-3.1.x86_64/drivers/net/wireless/brcm80211/Kconfig 2011-11-10 11:42:33.613907846 -0500
|
||||
@@ -5,7 +5,6 @@ config BRCMSMAC
|
||||
tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver"
|
||||
depends on PCI
|
||||
depends on MAC80211
|
||||
- depends on BCMA=n
|
||||
select BRCMUTIL
|
||||
select FW_LOADER
|
||||
select CRC_CCITT
|
|
@ -1462,6 +1462,7 @@ CONFIG_B43=m
|
|||
CONFIG_B43_PCMCIA=y
|
||||
CONFIG_B43_SDIO=y
|
||||
CONFIG_B43_BCMA=y
|
||||
CONFIG_B43_BCMA_PIO=y
|
||||
# CONFIG_B43_DEBUG is not set
|
||||
CONFIG_B43_PHY_LP=y
|
||||
CONFIG_B43_PHY_N=y
|
||||
|
@ -4576,7 +4577,11 @@ CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
|
|||
|
||||
CONFIG_TEST_KSTRTOX=m
|
||||
|
||||
# CONFIG_BCMA is not set
|
||||
CONFIG_BCMA=m
|
||||
CONFIG_BCMA_BLOCKIO=y
|
||||
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
|
||||
CONFIG_BCMA_HOST_PCI=y
|
||||
# CONFIG_BCMA_DEBUG is not set
|
||||
|
||||
# CONFIG_GOOGLE_FIRMWARE is not set
|
||||
CONFIG_INTEL_MID_PTI=m
|
||||
|
|
|
@ -786,6 +786,8 @@ Patch21080: sysfs-msi-irq-per-device.patch
|
|||
|
||||
#backport brcm80211 from 3.2-rc1
|
||||
Patch21090: brcm80211.patch
|
||||
Patch21091: bcma-brcmsmac-compat.patch
|
||||
|
||||
%endif
|
||||
|
||||
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
|
||||
|
@ -1452,6 +1454,8 @@ ApplyPatch sysfs-msi-irq-per-device.patch
|
|||
|
||||
#backport brcm80211 from 3.2-rc1
|
||||
ApplyPatch brcm80211.patch
|
||||
# Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331
|
||||
ApplyPatch bcma-brcmsmac-compat.patch
|
||||
|
||||
# END OF PATCH APPLICATIONS
|
||||
|
||||
|
@ -2154,6 +2158,9 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Fri Nov 11 2011 John W. Linville <linville@redhat.com>
|
||||
- Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331
|
||||
|
||||
* Thu Nov 10 2011 Chuck Ebbert <cebbert@redhat.com>
|
||||
- Sync samsung-laptop driver with what's in 3.2 (rhbz 747560)
|
||||
|
||||
|
|
Loading…
Reference in New Issue