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

[openwrt-10.03/.git] / package / mac80211 / patches / 300-pending_work.patch

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. */