aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-06-05 13:51:11 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-06-05 13:51:11 +0000
commitfd20a641360e4850e69c7dc6f058bd3700ddd373 (patch)
tree815dbe0b0536ee1c5dc9138c7ca20d55e4e066b5
parent8174c12c2309a24d34ad00690ef014f9fbc9d6f3 (diff)
downloadupstream-fd20a641360e4850e69c7dc6f058bd3700ddd373.tar.gz
upstream-fd20a641360e4850e69c7dc6f058bd3700ddd373.tar.bz2
upstream-fd20a641360e4850e69c7dc6f058bd3700ddd373.zip
mac80211: b43: update BCM4716 patch to compile without SSB
B43_SSB is optional after recent upstream changes. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 41014
-rw-r--r--package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch8
1 files changed, 5 insertions, 3 deletions
diff --git a/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch b/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
index 49b2468ce6..b6db3ac0c5 100644
--- a/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
+++ b/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
@@ -53,18 +53,20 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
__printf(2, 3) void b43err(struct b43_wl *wl, const char *fmt, ...);
--- a/drivers/net/wireless/b43/bus.h
+++ b/drivers/net/wireless/b43/bus.h
-@@ -70,6 +70,16 @@ static inline bool b43_bus_host_is_sdio(
+@@ -70,6 +70,18 @@ static inline bool b43_bus_host_is_sdio(
return false;
#endif
}
+static inline bool b43_bus_host_is_pci(struct b43_bus_dev *dev)
+{
-+ if (dev->bus_type == B43_BUS_SSB)
-+ return (dev->sdev->bus->bustype == SSB_BUSTYPE_PCI);
+#ifdef CPTCFG_B43_BCMA
+ if (dev->bus_type == B43_BUS_BCMA)
+ return (dev->bdev->bus->hosttype == BCMA_HOSTTYPE_PCI);
+#endif
++#ifdef CPTCFG_B43_SSB
++ if (dev->bus_type == B43_BUS_SSB)
++ return (dev->sdev->bus->bustype == SSB_BUSTYPE_PCI);
++#endif
+ return false;
+}