diff options
author | Felix Fietkau <nbd@nbd.name> | 2019-03-19 12:00:13 +0100 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2019-03-29 11:14:11 +0100 |
commit | b49c15e1211cc962cb73bbaaa5175ae068144893 (patch) | |
tree | 002e6978ac7dc9b8e6d322838c704a78d76f5b5e /net/mac80211 | |
parent | net: core: netif_receive_skb_list: unlist skb before passing to pt->func (diff) | |
download | linux-b49c15e1211cc962cb73bbaaa5175ae068144893.tar.xz linux-b49c15e1211cc962cb73bbaaa5175ae068144893.zip |
mac80211: un-schedule TXQs on powersave start
Once a station enters powersave, its queues should not be returned by
ieee80211_next_txq() anymore. They will be re-scheduled again after the
station has woken up again
Fixes: 1866760096bf4 ("mac80211: Add TXQ scheduling API")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/rx.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 7f8d93401ce0..bf0b187f994e 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1568,7 +1568,15 @@ static void sta_ps_start(struct sta_info *sta) return; for (tid = 0; tid < IEEE80211_NUM_TIDS; tid++) { - if (txq_has_queue(sta->sta.txq[tid])) + struct ieee80211_txq *txq = sta->sta.txq[tid]; + struct txq_info *txqi = to_txq_info(txq); + + spin_lock(&local->active_txq_lock[txq->ac]); + if (!list_empty(&txqi->schedule_order)) + list_del_init(&txqi->schedule_order); + spin_unlock(&local->active_txq_lock[txq->ac]); + + if (txq_has_queue(txq)) set_bit(tid, &sta->txq_buffered_tids); else clear_bit(tid, &sta->txq_buffered_tids); |