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>
Link: https://lore.kernel.org/r/20200908123702.88454-12-nbd@nbd.name
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index e793275d6e235fb7c4c75fbab8c2b900dce66cf6..28df5d02e4491721bb0acd007cd95d0a65bca34d 100644 (file)
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -1094,6 +1094,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];
@@ -1137,17 +1152,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);
@@ -1164,6 +1168,7 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw,
                I802_DEBUG_INC(local->dot11FailedCount);
        }
 
+free:
        if (!skb)
                return;