Merge remote-tracking branch 'net-next/master' into mac80211-next

[cascardo/linux.git] / net / mac80211 / sta_info.c

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 011880d..78e9ecb 100644 (file)
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -1202,12 +1202,10 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
 
        if (sta->sta.txq[0]) {
                for (i = 0; i < ARRAY_SIZE(sta->sta.txq); i++) {
-                       struct txq_info *txqi = to_txq_info(sta->sta.txq[i]);
-
-                       if (!txqi->tin.backlog_packets)
+                       if (!txq_has_queue(sta->sta.txq[i]))
                                continue;
 
-                       drv_wake_tx_queue(local, txqi);
+                       drv_wake_tx_queue(local, to_txq_info(sta->sta.txq[i]));
                }
        }
 
@@ -1638,10 +1636,8 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta,
                        return;
 
                for (tid = 0; tid < ARRAY_SIZE(sta->sta.txq); tid++) {
-                       struct txq_info *txqi = to_txq_info(sta->sta.txq[tid]);
-
                        if (!(driver_release_tids & BIT(tid)) ||
-                           txqi->tin.backlog_packets)
+                           txq_has_queue(sta->sta.txq[tid]))
                                continue;
 
                        sta_info_recalc_tim(sta);