bf6f7cf29b
The removed patches were applied upstream. Remove the 300-mac80211-optimize-skb-resizing.patch. This patch was not applied upstream, but it conflicts with upstream changes and needs bigger changes. It was applied with Felix to remove this patch for now. It should be reworked and then send upstream later. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
27 lines
900 B
Diff
27 lines
900 B
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Mon, 17 Aug 2020 13:29:12 +0200
|
|
Subject: [PATCH] mac80211: remove tx status call to
|
|
ieee80211_sta_register_airtime
|
|
|
|
All drivers using airtime fairness are calling ieee80211_sta_register_airtime
|
|
directly
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/net/mac80211/status.c
|
|
+++ b/net/mac80211/status.c
|
|
@@ -995,12 +995,6 @@ static void __ieee80211_tx_status(struct
|
|
ieee80211_sta_tx_notify(sta->sdata, (void *) skb->data,
|
|
acked, info->status.tx_time);
|
|
|
|
- if (info->status.tx_time &&
|
|
- wiphy_ext_feature_isset(local->hw.wiphy,
|
|
- NL80211_EXT_FEATURE_AIRTIME_FAIRNESS))
|
|
- ieee80211_sta_register_airtime(&sta->sta, tid,
|
|
- info->status.tx_time, 0);
|
|
-
|
|
if ((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().
|