From fd20a641360e4850e69c7dc6f058bd3700ddd373 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 5 Jun 2014 13:51:11 +0000 Subject: mac80211: b43: update BCM4716 patch to compile without SSB MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit B43_SSB is optional after recent upstream changes. Signed-off-by: Rafał Miłecki SVN-Revision: 41014 --- .../kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch | 8 +++++--- 1 file 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 __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; +} -- cgit v1.2.3