aboutsummaryrefslogtreecommitdiffstats
path: root/package
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
commit93b86d3bd1f208eaabc4ecd9e863792f2f0c0ec3 (patch)
tree9d288251f78d9d8475e2020ec247154f30b9d93d /package
parentb116a8ded247a0cdedf42644d4eda5ff6a621711 (diff)
downloadupstream-93b86d3bd1f208eaabc4ecd9e863792f2f0c0ec3.tar.gz
upstream-93b86d3bd1f208eaabc4ecd9e863792f2f0c0ec3.tar.bz2
upstream-93b86d3bd1f208eaabc4ecd9e863792f2f0c0ec3.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41014 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-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;
+}