diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-02-07 11:28:11 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-02-07 11:28:11 +0000 |
commit | 2119054b0a501a065a656f106d3fec11f0c854d3 (patch) | |
tree | 591965ae3e7e4671400eff996096b8f4545d7338 /package/mac80211/patches/810-b43_no_pio.patch | |
parent | a633639fe6e9486f9403914cded6aff130c2e973 (diff) | |
download | master-187ad058-2119054b0a501a065a656f106d3fec11f0c854d3.tar.gz master-187ad058-2119054b0a501a065a656f106d3fec11f0c854d3.tar.bz2 master-187ad058-2119054b0a501a065a656f106d3fec11f0c854d3.zip |
mac80211: update to wireless-testing 2012-02-06
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30346 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/810-b43_no_pio.patch')
-rw-r--r-- | package/mac80211/patches/810-b43_no_pio.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/package/mac80211/patches/810-b43_no_pio.patch b/package/mac80211/patches/810-b43_no_pio.patch index be899c14d4..2827517a74 100644 --- a/package/mac80211/patches/810-b43_no_pio.patch +++ b/package/mac80211/patches/810-b43_no_pio.patch @@ -11,18 +11,19 @@ b43-$(CONFIG_B43_PCMCIA) += pcmcia.o --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c -@@ -1893,9 +1893,11 @@ static void b43_do_interrupt_thread(stru +@@ -1885,10 +1885,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 " "on your system. It will now be switched to PIO.\n"); -+#ifdef CONFIG_B43_PIO /* Fall back to PIO transfers if we get fatal DMA errors! */ - dev->use_pio = 1; - b43_controller_restart(dev, "DMA error"); + dev->use_pio = true; +#endif + b43_controller_restart(dev, "DMA error"); return; } - if (merged_dma_reason & B43_DMAIRQ_NONFATALMASK) { --- 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 |