mac80211: remove a WARN_ON that causes compile errors on 2.6.32

[openwrt.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 7a8e1b1..d3bcece 100644 (file)
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -1139,7 +1139,7 @@
 +      ath_hw_cycle_counters_update(common);
 +      spin_unlock(&common->cc_lock);
 +
-+      ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_NETWORK_SLEEP);
++      ath9k_hw_setpower(sc->sc_ah, mode);
  
   unlock:
        spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
@@ -2848,3 +2848,15 @@
        }
  
        /* Note: country IE parsing is done for us by cfg80211 */
+--- a/drivers/net/wireless/b43/main.c
++++ b/drivers/net/wireless/b43/main.c
+@@ -1613,7 +1613,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. */