[PATCH 297/379][SRU][OEM-5.6] mac80211: support using ieee80211_tx_status_ext to free skbs without status info
You-Sheng Yang
vicamo.yang at canonical.com
Wed Dec 23 08:50:30 UTC 2020
From: Felix Fietkau <nbd at nbd.name>
BugLink: https://bugs.launchpad.net/bugs/1879633
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 at nbd.name>
Link: https://lore.kernel.org/r/20200908123702.88454-12-nbd@nbd.name
Signed-off-by: Johannes Berg <johannes.berg at intel.com>
(cherry picked from commit 23e9f1ef16629da70acb171589e33c0a3f6ec628)
Signed-off-by: You-Sheng Yang <vicamo.yang at canonical.com>
---
net/mac80211/status.c | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 21db18ae89e3..500d77f21e4e 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -1088,6 +1088,21 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw,
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];
@@ -1131,17 +1146,6 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw,
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);
@@ -1158,6 +1162,7 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw,
I802_DEBUG_INC(local->dot11FailedCount);
}
+free:
if (!skb)
return;
--
2.29.2
More information about the kernel-team
mailing list