From 652c2c141d4d3aa85fc10e38e5bd10510691c757 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Mon, 30 Jan 2012 12:51:06 -0500 Subject: [PATCH] Reinstate patch to remove overlap between bcma/b43 and brcmsmac --- bcma-brcmsmac-compat.patch | 35 +++++++++++++++++++++++++++++++++++ kernel.spec | 9 +++++++++ 2 files changed, 44 insertions(+) create mode 100644 bcma-brcmsmac-compat.patch diff --git a/bcma-brcmsmac-compat.patch b/bcma-brcmsmac-compat.patch new file mode 100644 index 000000000..e16e5b0c5 --- /dev/null +++ b/bcma-brcmsmac-compat.patch @@ -0,0 +1,35 @@ +Simple patch to remove the overlap between the bcma (i.e. b43) driver +and the brcmsmac driver. David Woodhouse +confirmed that this patch restores functionality of bcm4331 devices. + +-- John W. Linville + +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 diff --git a/kernel.spec b/kernel.spec index 848a58fa0..95f21ea30 100644 --- a/kernel.spec +++ b/kernel.spec @@ -690,6 +690,9 @@ Patch21084: proc-fix-null-pointer-deref-in-proc_pid_permission.patch #rhbz 783211 Patch21087: fs-Inval-cache-for-parent-block-device-if-fsync-called-on-part.patch +# Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331 +Patch21091: bcma-brcmsmac-compat.patch + #rhbz 771058 Patch21100: msi-irq-sysfs-warning.patch @@ -1300,6 +1303,9 @@ ApplyPatch rds-Make-rds_sock_lock-BH-rather-than-IRQ-safe.patch #rhbz 783211 ApplyPatch fs-Inval-cache-for-parent-block-device-if-fsync-called-on-part.patch +# Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331 +ApplyPatch bcma-brcmsmac-compat.patch + # END OF PATCH APPLICATIONS %endif @@ -1947,6 +1953,9 @@ fi # and build. %changelog +* Mon Jan 30 2012 John W. Linville +- Reinstate patch to remove overlap between bcma/b43 and brcmsmac + * Mon Jan 30 2012 Dave Jones 2.6.42.2-1 - Rebase to 3.2.2