Merge tag 'wireless-2024-01-22' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / net / mac80211 / tx.c

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 4b2823e36a374685458655d6e7788d64a976b9fe..68a48abc72876c4abaa8cf4c95d7c2793dc07813 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -4013,14 +4013,13 @@ ieee80211_txq_set_active(struct txq_info *txqi)
                return;
 
        sta = container_of(txqi->txq.sta, struct sta_info, sta);
-       sta->airtime[txqi->txq.ac].last_active = (u32)jiffies;
+       sta->airtime[txqi->txq.ac].last_active = jiffies;
 }
 
 static bool
 ieee80211_txq_keep_active(struct txq_info *txqi)
 {
        struct sta_info *sta;
-       u32 diff;
 
        if (!txqi->txq.sta)
                return false;
@@ -4029,9 +4028,7 @@ ieee80211_txq_keep_active(struct txq_info *txqi)
        if (ieee80211_sta_deficit(sta, txqi->txq.ac) >= 0)
                return false;
 
-       diff = (u32)jiffies - sta->airtime[txqi->txq.ac].last_active;
-
-       return diff <= AIRTIME_ACTIVE_DURATION;
+       return ieee80211_sta_keep_active(sta, txqi->txq.ac);
 }
 
 struct ieee80211_txq *ieee80211_next_txq(struct ieee80211_hw *hw, u8 ac)