Author: nbd Date: 2014-06-05 15:51:11 +0200 (Thu, 05 Jun 2014) New Revision: 41014
Modified: trunk/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch Log: mac80211: b43: update BCM4716 patch to compile without SSB B43_SSB is optional after recent upstream changes. Signed-off-by: Rafa?\197?\130 Mi?\197?\130ecki <[email protected]> Modified: trunk/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch =================================================================== --- trunk/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch 2014-06-05 13:51:08 UTC (rev 41013) +++ trunk/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch 2014-06-05 13:51:11 UTC (rev 41014) @@ -53,18 +53,20 @@ __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; +} _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
