X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fmac80211%2Fpatches%2F810-b43_no_pio.patch;h=f511795b17f98078e504b36bbb4d7f6a95eb4f34;hb=adcd2dbc79b5a648d7b6c328a94f731c479c79b5;hp=a913b6de7a2fca96a60a91331801462f1ebe5764;hpb=437bd1772aceb2fc48ac5b11d68b366d0516715e;p=openwrt.git

diff --git a/package/mac80211/patches/810-b43_no_pio.patch b/package/mac80211/patches/810-b43_no_pio.patch
index a913b6de7a..f511795b17 100644
--- a/package/mac80211/patches/810-b43_no_pio.patch
+++ b/package/mac80211/patches/810-b43_no_pio.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/b43/Makefile
 +++ b/drivers/net/wireless/b43/Makefile
-@@ -17,7 +17,7 @@ b43-y				+= xmit.o
+@@ -20,7 +20,7 @@ b43-y				+= xmit.o
  b43-y				+= lo.o
  b43-y				+= wa.o
  b43-y				+= dma.o
@@ -11,18 +11,19 @@
  b43-$(CONFIG_B43_PCMCIA)	+= pcmcia.o
 --- a/drivers/net/wireless/b43/main.c
 +++ b/drivers/net/wireless/b43/main.c
-@@ -1834,9 +1834,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