From d1af787dc992741bffa1a1ce0b4ca7eacb1f7227 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 12 Jul 2013 08:19:04 +0000
Subject: mac80211: backport latest version from trunk (as of r37265)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@37266 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/mac80211/patches/810-b43_no_pio.patch | 35 ++++++++++++++++++---------
 1 file changed, 23 insertions(+), 12 deletions(-)

(limited to 'package/mac80211/patches/810-b43_no_pio.patch')

diff --git a/package/mac80211/patches/810-b43_no_pio.patch b/package/mac80211/patches/810-b43_no_pio.patch
index 5b4c22e520..1206923e0d 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
-@@ -1909,10 +1909,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]);
+@@ -1915,10 +1915,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
+@@ -98,7 +98,7 @@ config B43_BCMA_PIO
+ 	default y
+ 
+ config B43_PIO
+-	bool
++	bool "Broadcom 43xx PIO support"
+ 	depends on B43
+ 	select SSB_BLOCKIO
+ 	default y
-- 
cgit v1.2.3