b43: merge ad-hoc beacon fix (backport of r28258)

SVN-Revision: 28259

diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index b19865ad302bce3530b1570a987e6b1f7bbfc603..2f403b87f9855adc02de1b4ff7409b6478c0da33 100644 (file)
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -355,3 +355,15 @@
        }
  
        local->num_sta--;
+--- a/drivers/net/wireless/b43/main.c
++++ b/drivers/net/wireless/b43/main.c
+@@ -1611,7 +1611,8 @@ static void handle_irq_beacon(struct b43
+       u32 cmd, beacon0_valid, beacon1_valid;
+ 
+       if (!b43_is_mode(wl, NL80211_IFTYPE_AP) &&
+-          !b43_is_mode(wl, NL80211_IFTYPE_MESH_POINT))
++          !b43_is_mode(wl, NL80211_IFTYPE_MESH_POINT) &&
++          !b43_is_mode(wl, NL80211_IFTYPE_ADHOC))
+               return;
+ 
+       /* This is the bottom half of the asynchronous beacon update. */

diff --git a/package/mac80211/patches/800-b43-gpio-mask-module-option.patch b/package/mac80211/patches/800-b43-gpio-mask-module-option.patch
index a9958829f8e1bf0ae5532f51e356fd1bced05d80..6c193d33294af2d99f97bc85c57723731c6a0166 100644 (file)
--- a/package/mac80211/patches/800-b43-gpio-mask-module-option.patch
+++ b/package/mac80211/patches/800-b43-gpio-mask-module-option.patch
@@ -22,7 +22,7 @@
  static int modparam_bad_frames_preempt;
  module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444);
  MODULE_PARM_DESC(bad_frames_preempt,
-@@ -2676,10 +2681,10 @@ static int b43_gpio_init(struct b43_wlde
+@@ -2677,10 +2682,10 @@ static int b43_gpio_init(struct b43_wlde
                    & ~B43_MACCTL_GPOUTSMSK);
  
        b43_write16(dev, B43_MMIO_GPIO_MASK, b43_read16(dev, B43_MMIO_GPIO_MASK)

diff --git a/package/mac80211/patches/810-b43_no_pio.patch b/package/mac80211/patches/810-b43_no_pio.patch
index 33c986534ce57ee8927861363ca3577c1b95a7cb..1d0382cd204fdc4acd718e39ee95fc585d9e67d6 100644 (file)
--- a/package/mac80211/patches/810-b43_no_pio.patch
+++ b/package/mac80211/patches/810-b43_no_pio.patch
@@ -11,7 +11,7 @@
  b43-$(CONFIG_B43_PCMCIA)      += pcmcia.o
 --- a/drivers/net/wireless/b43/main.c
 +++ b/drivers/net/wireless/b43/main.c
-@@ -1883,9 +1883,11 @@ static void b43_do_interrupt_thread(stru
+@@ -1884,9 +1884,11 @@ static void b43_do_interrupt_thread(stru
                               dma_reason[4], dma_reason[5]);
                        b43err(dev->wl, "This device does not support DMA "
                               "on your system. It will now be switched to PIO.\n");