diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-06-15 20:14:06 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-06-15 20:14:06 +0000 |
| commit | 5ca4d24cd1043e142515ac66c44a26a2371978d3 (patch) | |
| tree | f7411ae4df9fed440179fab0be52e2f1640544ed /package/mac80211/patches/810-b43_no_pio.patch | |
| parent | d3a7b5633c7c1ea142cb8c0872cab484ca385c92 (diff) | |
| download | upstream-5ca4d24cd1043e142515ac66c44a26a2371978d3.tar.gz upstream-5ca4d24cd1043e142515ac66c44a26a2371978d3.tar.bz2 upstream-5ca4d24cd1043e142515ac66c44a26a2371978d3.zip | |
mac80211: update to wireless-testing 2013-06-13 + latest backport infrastructure
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36939
Diffstat (limited to 'package/mac80211/patches/810-b43_no_pio.patch')
| -rw-r--r-- | package/mac80211/patches/810-b43_no_pio.patch | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/package/mac80211/patches/810-b43_no_pio.patch b/package/mac80211/patches/810-b43_no_pio.patch index 66c50ae3ea..0821dc7856 100644 --- a/package/mac80211/patches/810-b43_no_pio.patch +++ b/package/mac80211/patches/810-b43_no_pio.patch @@ -7,23 +7,23 @@ -b43-y += pio.o +b43-$(CONFIG_B43_PIO) += pio.o b43-y += rfkill.o - b43-$(CONFIG_B43_LEDS) += leds.o - b43-$(CONFIG_B43_PCMCIA) += pcmcia.o + b43-$(CPTCFG_B43_LEDS) += leds.o + b43-$(CPTCFG_B43_PCMCIA) += pcmcia.o --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c -@@ -1916,10 +1916,12 @@ static void b43_do_interrupt_thread(stru - dma_reason[0], dma_reason[1], - dma_reason[2], dma_reason[3], - dma_reason[4], dma_reason[5]); +@@ -1913,10 +1913,12 @@ static void b43_do_interrupt_thread(stru + dma_reason[0], dma_reason[1], + dma_reason[2], dma_reason[3], + dma_reason[4], dma_reason[5]); +#ifdef CONFIG_B43_PIO - b43err(dev->wl, "This device does not support DMA " + b43err(dev->wl, "This device does not support DMA " "on your system. It will now be switched to PIO.\n"); - /* Fall back to PIO transfers if we get fatal DMA errors! */ - dev->use_pio = true; + /* Fall back to PIO transfers if we get fatal DMA errors! */ + dev->use_pio = true; +#endif - b43_controller_restart(dev, "DMA error"); - return; - } + b43_controller_restart(dev, "DMA error"); + return; + } --- a/drivers/net/wireless/b43/pio.h +++ b/drivers/net/wireless/b43/pio.h @@ -150,7 +150,7 @@ static inline void b43_piorx_write32(str @@ -73,3 +73,14 @@ +#endif /* CONFIG_B43_PIO */ #endif /* B43_PIO_H_ */ +--- a/drivers/net/wireless/b43/Kconfig ++++ b/drivers/net/wireless/b43/Kconfig +@@ -104,7 +104,7 @@ config B43_BCMA_PIO + default y + + config B43_PIO +- bool ++ bool "Broadcom 43xx PIO support" + depends on B43 + select SSB_BLOCKIO + default y |