mac80211: backport new register bitfield macros

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / 810-b43_no_pio.patch

diff --git a/package/kernel/mac80211/patches/810-b43_no_pio.patch b/package/kernel/mac80211/patches/810-b43_no_pio.patch
index 1206923e0df2d202734e88379af5f5719b6fad9e..79428c278450e400e2566628ac6d1e0ed69694fc 100644 (file)
--- a/package/kernel/mac80211/patches/810-b43_no_pio.patch
+++ b/package/kernel/mac80211/patches/810-b43_no_pio.patch
@@ -1,21 +1,21 @@
---- a/drivers/net/wireless/b43/Makefile
-+++ b/drivers/net/wireless/b43/Makefile
-@@ -20,7 +20,7 @@ b43-y                                += xmit.o
- b43-y                         += lo.o
- b43-y                         += wa.o
+--- a/drivers/net/wireless/broadcom/b43/Makefile
++++ b/drivers/net/wireless/broadcom/b43/Makefile
+@@ -17,7 +17,7 @@ b43-$(CPTCFG_B43_PHY_AC)     += phy_ac.o
+ b43-y                         += sysfs.o
+ b43-y                         += xmit.o
  b43-y                         += dma.o
 -b43-y                         += pio.o
-+b43-$(CONFIG_B43_PIO)         += pio.o
++b43-$(CPTCFG_B43_PIO)         += pio.o
  b43-y                         += rfkill.o
+ b43-y                         += ppr.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
-@@ -1915,10 +1915,12 @@ static void b43_do_interrupt_thread(stru
+--- a/drivers/net/wireless/broadcom/b43/main.c
++++ b/drivers/net/wireless/broadcom/b43/main.c
+@@ -2008,10 +2008,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
++#ifdef CPTCFG_B43_PIO
                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! */
@@ -24,14 +24,14 @@
                b43_controller_restart(dev, "DMA error");
                return;
        }
---- a/drivers/net/wireless/b43/pio.h
-+++ b/drivers/net/wireless/b43/pio.h
+--- a/drivers/net/wireless/broadcom/b43/pio.h
++++ b/drivers/net/wireless/broadcom/b43/pio.h
 @@ -150,7 +150,7 @@ static inline void b43_piorx_write32(str
        b43_write32(q->dev, q->mmio_base + offset, value);
  }
  
 -
-+#ifdef CONFIG_B43_PIO
++#ifdef CPTCFG_B43_PIO
  int b43_pio_init(struct b43_wldev *dev);
  void b43_pio_free(struct b43_wldev *dev);
  
@@ -70,17 +70,17 @@
 +static inline void b43_pio_tx_resume(struct b43_wldev *dev)
 +{
 +}
-+#endif /* CONFIG_B43_PIO */
++#endif /* CPTCFG_B43_PIO */
  
  #endif /* B43_PIO_H_ */
---- a/drivers/net/wireless/b43/Kconfig
-+++ b/drivers/net/wireless/b43/Kconfig
+--- a/drivers/net/wireless/broadcom/b43/Kconfig
++++ b/drivers/net/wireless/broadcom/b43/Kconfig
 @@ -98,7 +98,7 @@ config B43_BCMA_PIO
        default y
  
  config B43_PIO
 -      bool
 +      bool "Broadcom 43xx PIO support"
-       depends on B43
+       depends on B43 && B43_SSB
        select SSB_BLOCKIO
        default y