mac80211: Remove check for offchannel state when waking netdev queues
authorSeth Forshee <seth.forshee@canonical.com>
Tue, 15 Oct 2013 21:16:21 +0000 (16:16 -0500)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 28 Oct 2013 14:05:26 +0000 (15:05 +0100)
6c17b77b67587b9f9e3070fb89fe98cef3187131 ensures that a device's
mac80211 queues will remain stopped while offchannel. Since the
vif can no longer be offchannel when the queues wake it's not
necessary to check for this before waking its netdev queues.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/util.c

index b763e4ccaf5eea5ea088c39dc3d2c63fad9b8281..65ebe0c5e8359013286d6c9376f6a82bb5a2ce88 100644 (file)
@@ -300,9 +300,6 @@ void ieee80211_propagate_queue_wake(struct ieee80211_local *local, int queue)
                if (!sdata->dev)
                        continue;
 
-               if (test_bit(SDATA_STATE_OFFCHANNEL, &sdata->state))
-                       continue;
-
                if (sdata->vif.cab_queue != IEEE80211_INVAL_HW_QUEUE &&
                    local->queue_stop_reasons[sdata->vif.cab_queue] != 0)
                        continue;