Merge branch 'header-move' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemo...

[linux-2.6-omap-h63xx.git] / net / mac80211 / util.c

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index ce62b163b82c46d2e8814e29d1f5ce73a2f250c3..0d463c80c4045359a8c8f0dc6df29903eae4f8a0 100644 (file)
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -361,14 +361,10 @@ void ieee80211_wake_queue(struct ieee80211_hw *hw, int queue)
        struct ieee80211_local *local = hw_to_local(hw);
 
        if (test_bit(queue, local->queues_pending)) {
+               set_bit(queue, local->queues_pending_run);
                tasklet_schedule(&local->tx_pending_tasklet);
        } else {
-               if (ieee80211_is_multiqueue(local)) {
-                       netif_wake_subqueue(local->mdev, queue);
-               } else {
-                       WARN_ON(queue != 0);
-                       netif_wake_queue(local->mdev);
-               }
+               netif_wake_subqueue(local->mdev, queue);
        }
 }
 EXPORT_SYMBOL(ieee80211_wake_queue);
@@ -377,12 +373,7 @@ void ieee80211_stop_queue(struct ieee80211_hw *hw, int queue)
 {
        struct ieee80211_local *local = hw_to_local(hw);
 
-       if (ieee80211_is_multiqueue(local)) {
-               netif_stop_subqueue(local->mdev, queue);
-       } else {
-               WARN_ON(queue != 0);
-               netif_stop_queue(local->mdev);
-       }
+       netif_stop_subqueue(local->mdev, queue);
 }
 EXPORT_SYMBOL(ieee80211_stop_queue);
 
@@ -428,8 +419,6 @@ void ieee80211_iterate_active_interfaces(
                case IEEE80211_IF_TYPE_MESH_POINT:
                        break;
                }
-               if (sdata->dev == local->mdev)
-                       continue;
                if (netif_running(sdata->dev))
                        iterator(data, sdata->dev->dev_addr,
                                 &sdata->vif);
@@ -463,8 +452,6 @@ void ieee80211_iterate_active_interfaces_atomic(
                case IEEE80211_IF_TYPE_MESH_POINT:
                        break;
                }
-               if (sdata->dev == local->mdev)
-                       continue;
                if (netif_running(sdata->dev))
                        iterator(data, sdata->dev->dev_addr,
                                 &sdata->vif);