Merge tag 'for-v3.18' of git://git.infradead.org/battery-2.6

[karo-tx-linux.git] / net / mac80211 / agg-tx.c

diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index ce9633a3cfb0c54abe7aa87746f2b843cf33e65c..d6986f3aa5c469fa15dfbc585d72ec0b5cc53af4 100644 (file)
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -170,10 +170,13 @@ ieee80211_stop_queue_agg(struct ieee80211_sub_if_data *sdata, int tid)
 {
        int queue = sdata->vif.hw_queue[ieee80211_ac_from_tid(tid)];
 
+       /* we do refcounting here, so don't use the queue reason refcounting */
+
        if (atomic_inc_return(&sdata->local->agg_queue_stop[queue]) == 1)
                ieee80211_stop_queue_by_reason(
                        &sdata->local->hw, queue,
-                       IEEE80211_QUEUE_STOP_REASON_AGGREGATION);
+                       IEEE80211_QUEUE_STOP_REASON_AGGREGATION,
+                       false);
        __acquire(agg_queue);
 }
 
@@ -185,7 +188,8 @@ ieee80211_wake_queue_agg(struct ieee80211_sub_if_data *sdata, int tid)
        if (atomic_dec_return(&sdata->local->agg_queue_stop[queue]) == 0)
                ieee80211_wake_queue_by_reason(
                        &sdata->local->hw, queue,
-                       IEEE80211_QUEUE_STOP_REASON_AGGREGATION);
+                       IEEE80211_QUEUE_STOP_REASON_AGGREGATION,
+                       false);
        __release(agg_queue);
 }