mac80211: add specific-queue flushing support

If the HW supports IEEE80211_HW_QUEUE_CONTROL, allow
flushing only specific queues rather than all of them.

Signed-off-by: Liad Kaufman <liad.kaufman@intel.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

2 files changed, 18 insertions, 5 deletions

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 5de2e5f3a57e..a30d40839d49 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1881,6 +1881,9 @@ void ieee80211_add_pending_skbs(struct ieee80211_local *local,
                                 struct sk_buff_head *skbs);
 void ieee80211_flush_queues(struct ieee80211_local *local,
                             struct ieee80211_sub_if_data *sdata);
+void __ieee80211_flush_queues(struct ieee80211_local *local,
+                              struct ieee80211_sub_if_data *sdata,
+                              unsigned int queues);
 
 void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
                          u16 transaction, u16 auth_alg, u16 status,
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 9e5bfd614856..745a8a9cbbb5 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -576,15 +576,19 @@ ieee80211_get_vif_queues(struct ieee80211_local *local,
         return queues;
 }
 
-void ieee80211_flush_queues(struct ieee80211_local *local,
-                            struct ieee80211_sub_if_data *sdata)
+void __ieee80211_flush_queues(struct ieee80211_local *local,
+                              struct ieee80211_sub_if_data *sdata,
+                              unsigned int queues)
 {
-        unsigned int queues;
-
         if (!local->ops->flush)
                 return;
 
-        queues = ieee80211_get_vif_queues(local, sdata);
+        /*
+         * If no queue was set, or if the HW doesn't support
+         * IEEE80211_HW_QUEUE_CONTROL - flush all queues
+         */
+        if (!queues || !(local->hw.flags & IEEE80211_HW_QUEUE_CONTROL))
+                queues = ieee80211_get_vif_queues(local, sdata);
 
         ieee80211_stop_queues_by_reason(&local->hw, queues,
                                         IEEE80211_QUEUE_STOP_REASON_FLUSH,
@@ -597,6 +601,12 @@ void ieee80211_flush_queues(struct ieee80211_local *local,
                                         false);
 }
 
+void ieee80211_flush_queues(struct ieee80211_local *local,
+                            struct ieee80211_sub_if_data *sdata)
+{
+        __ieee80211_flush_queues(local, sdata, 0);
+}
+
 void ieee80211_stop_vif_queues(struct ieee80211_local *local,
                                struct ieee80211_sub_if_data *sdata,
                                enum queue_stop_reason reason)