mac80211: update encap offload patches to the latest version

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / subsys / 322-mac80211-support-using-ieee80211_tx_status_ext-to-fr.patch

diff --git a/package/kernel/mac80211/patches/subsys/322-mac80211-support-using-ieee80211_tx_status_ext-to-fr.patch b/package/kernel/mac80211/patches/subsys/322-mac80211-support-using-ieee80211_tx_status_ext-to-fr.patch
deleted file mode 100644 (file)
index 5469a41..0000000
--- a/package/kernel/mac80211/patches/subsys/322-mac80211-support-using-ieee80211_tx_status_ext-to-fr.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Thu, 20 Aug 2020 17:27:00 +0200
-Subject: [PATCH] mac80211: support using ieee80211_tx_status_ext to free
- skbs without status info
-
-For encap-offloaded packets, ieee80211_free_txskb cannot be used, since it
-does not have the vif pointer.
-Using ieee80211_tx_status_ext for this purpose has the advantage of being able
-avoid an extra station lookup for AQL
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/net/mac80211/status.c
-+++ b/net/mac80211/status.c
-@@ -1103,6 +1103,21 @@ void ieee80211_tx_status_ext(struct ieee
-                       sta->tx_stats.last_rate_info = *status->rate;
-       }
- 
-+      if (skb && (tx_time_est =
-+                  ieee80211_info_get_tx_time_est(IEEE80211_SKB_CB(skb))) > 0) {
-+              /* Do this here to avoid the expensive lookup of the sta
-+               * in ieee80211_report_used_skb().
-+               */
-+              ieee80211_sta_update_pending_airtime(local, sta,
-+                                                   skb_get_queue_mapping(skb),
-+                                                   tx_time_est,
-+                                                   true);
-+              ieee80211_info_set_tx_time_est(IEEE80211_SKB_CB(skb), 0);
-+      }
-+
-+      if (!status->info)
-+              goto free;
-+
-       rates_idx = ieee80211_tx_get_rates(hw, info, &retry_count);
- 
-       sband = hw->wiphy->bands[info->band];
-@@ -1146,17 +1161,6 @@ void ieee80211_tx_status_ext(struct ieee
-                       ieee80211s_update_metric(local, sta, status);
-       }
- 
--      if (skb && (tx_time_est = ieee80211_info_get_tx_time_est(info)) > 0) {
--              /* Do this here to avoid the expensive lookup of the sta
--               * in ieee80211_report_used_skb().
--               */
--              ieee80211_sta_update_pending_airtime(local, sta,
--                                                   skb_get_queue_mapping(skb),
--                                                   tx_time_est,
--                                                   true);
--              ieee80211_info_set_tx_time_est(info, 0);
--      }
--
-       if (skb && !(info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP))
-               return __ieee80211_tx_status(hw, status, rates_idx,
-                                            retry_count);
-@@ -1173,6 +1177,7 @@ void ieee80211_tx_status_ext(struct ieee
-               I802_DEBUG_INC(local->dot11FailedCount);
-       }
- 
-+free:
-       if (!skb)
-               return;
-