mac80211: Update to version 5.1-rc2-1

[openwrt/staging/hauke.git] / package / kernel / mac80211 / patches / subsys / 352-mac80211-rework-locking-for-txq-scheduling-airtime-f.patch

diff --git a/package/kernel/mac80211/patches/subsys/352-mac80211-rework-locking-for-txq-scheduling-airtime-f.patch b/package/kernel/mac80211/patches/subsys/352-mac80211-rework-locking-for-txq-scheduling-airtime-f.patch
index 02e8a06c0c1b6cb327746bd4c0722e81509daff9..ff3f0f728a22eb82e5ae5c0e71238340618092a4 100644 (file)
--- a/package/kernel/mac80211/patches/subsys/352-mac80211-rework-locking-for-txq-scheduling-airtime-f.patch
+++ b/package/kernel/mac80211/patches/subsys/352-mac80211-rework-locking-for-txq-scheduling-airtime-f.patch
@@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -6205,8 +6205,6 @@ struct sk_buff *ieee80211_tx_dequeue(str
+@@ -6269,8 +6269,6 @@ struct sk_buff *ieee80211_tx_dequeue(str
   * @hw: pointer as obtained from ieee80211_alloc_hw()
   * @ac: AC number to return packets from.
   *
@@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
   * Returns the next txq if successful, %NULL if no queue is eligible. If a txq
   * is returned, it should be returned with ieee80211_return_txq() after the
   * driver has finished scheduling it.
-@@ -6214,51 +6212,41 @@ struct sk_buff *ieee80211_tx_dequeue(str
+@@ -6278,51 +6276,41 @@ struct sk_buff *ieee80211_tx_dequeue(str
  struct ieee80211_txq *ieee80211_next_txq(struct ieee80211_hw *hw, u8 ac);
  
  /**
@@ -146,26 +146,25 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
        if (list_empty(&txqi->schedule_order) &&
            (!skb_queue_empty(&txqi->frags) || txqi->tin.backlog_packets)) {
-@@ -3718,18 +3723,7 @@ void ieee80211_return_txq(struct ieee802
+@@ -3718,17 +3723,7 @@ void ieee80211_return_txq(struct ieee802
                        list_add_tail(&txqi->schedule_order,
                                      &local->active_txqs[txq->ac]);
        }
 -}
 -EXPORT_SYMBOL(ieee80211_return_txq);
- 
+-
 -void ieee80211_schedule_txq(struct ieee80211_hw *hw,
 -                          struct ieee80211_txq *txq)
 -      __acquires(txq_lock) __releases(txq_lock)
 -{
 -      struct ieee80211_local *local = hw_to_local(hw);
--      struct txq_info *txqi = to_txq_info(txq);
--
+ 
 -      spin_lock_bh(&local->active_txq_lock[txq->ac]);
 -      ieee80211_return_txq(hw, txq);
        spin_unlock_bh(&local->active_txq_lock[txq->ac]);
  }
  EXPORT_SYMBOL(ieee80211_schedule_txq);
-@@ -3742,7 +3736,7 @@ bool ieee80211_txq_may_transmit(struct i
+@@ -3741,7 +3736,7 @@ bool ieee80211_txq_may_transmit(struct i
        struct sta_info *sta;
        u8 ac = txq->ac;
  
@@ -174,7 +173,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
        if (!txqi->txq.sta)
                goto out;
-@@ -3772,34 +3766,27 @@ bool ieee80211_txq_may_transmit(struct i
+@@ -3771,34 +3766,27 @@ bool ieee80211_txq_may_transmit(struct i
  
        sta->airtime[ac].deficit += sta->airtime_weight;
        list_move_tail(&txqi->schedule_order, &local->active_txqs[ac]);