Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2 files changed, 13 insertions, 12 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 69097d1faeb6..67d167993d45 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -157,6 +157,7 @@ static void rt2x00lib_intf_scheduled(struct work_struct *work)
          * requested configurations.
          */
         ieee80211_iterate_active_interfaces(rt2x00dev->hw,
+                                            IEEE80211_IFACE_ITER_RESUME_ALL,
                                             rt2x00lib_intf_scheduled_iter,
                                             rt2x00dev);
 }
@@ -225,9 +226,9 @@ void rt2x00lib_beacondone(struct rt2x00_dev *rt2x00dev)
                 return;
 
         /* send buffered bc/mc frames out for every bssid */
-        ieee80211_iterate_active_interfaces_atomic(rt2x00dev->hw,
-                                                   rt2x00lib_bc_buffer_iter,
-                                                   rt2x00dev);
+        ieee80211_iterate_active_interfaces_atomic(
+                rt2x00dev->hw, IEEE80211_IFACE_ITER_RESUME_ALL,
+                rt2x00lib_bc_buffer_iter, rt2x00dev);
         /*
          * Devices with pre tbtt interrupt don't need to update the beacon
          * here as they will fetch the next beacon directly prior to
@@ -237,9 +238,9 @@ void rt2x00lib_beacondone(struct rt2x00_dev *rt2x00dev)
                 return;
 
         /* fetch next beacon */
-        ieee80211_iterate_active_interfaces_atomic(rt2x00dev->hw,
-                                                   rt2x00lib_beaconupdate_iter,
-                                                   rt2x00dev);
+        ieee80211_iterate_active_interfaces_atomic(
+                rt2x00dev->hw, IEEE80211_IFACE_ITER_RESUME_ALL,
+                rt2x00lib_beaconupdate_iter, rt2x00dev);
 }
 EXPORT_SYMBOL_GPL(rt2x00lib_beacondone);
 
@@ -249,9 +250,9 @@ void rt2x00lib_pretbtt(struct rt2x00_dev *rt2x00dev)
                 return;
 
         /* fetch next beacon */
-        ieee80211_iterate_active_interfaces_atomic(rt2x00dev->hw,
-                                                   rt2x00lib_beaconupdate_iter,
-                                                   rt2x00dev);
+        ieee80211_iterate_active_interfaces_atomic(
+                rt2x00dev->hw, IEEE80211_IFACE_ITER_RESUME_ALL,
+                rt2x00lib_beaconupdate_iter, rt2x00dev);
 }
 EXPORT_SYMBOL_GPL(rt2x00lib_pretbtt);
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 98a9e48f8e4a..ed7a1bb3f245 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -424,9 +424,9 @@ int rt2x00mac_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
         if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
                 return 0;
 
-        ieee80211_iterate_active_interfaces_atomic(rt2x00dev->hw,
-                                                   rt2x00mac_set_tim_iter,
-                                                   rt2x00dev);
+        ieee80211_iterate_active_interfaces_atomic(
+                rt2x00dev->hw, IEEE80211_IFACE_ITER_RESUME_ALL,
+                rt2x00mac_set_tim_iter, rt2x00dev);
 
         /* queue work to upodate the beacon template */
         ieee80211_queue_work(rt2x00dev->hw, &rt2x00dev->intf_work);