aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/subsys/305-mac80211-improve-AQL-tx-airtime-estimation.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-08-06 20:37:44 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2020-08-10 19:34:37 +0200
commitfce0f1501b12b54c0961802ff10b4b5f24a1a33d (patch)
tree334031dde5849be4e2bcb7ede89f4e4c3f9a62a1 /package/kernel/mac80211/patches/subsys/305-mac80211-improve-AQL-tx-airtime-estimation.patch
parentd32010d5ff7455cd51fb6b3e06fa4662ad87eaa9 (diff)
downloadupstream-fce0f1501b12b54c0961802ff10b4b5f24a1a33d.tar.gz
upstream-fce0f1501b12b54c0961802ff10b4b5f24a1a33d.tar.bz2
upstream-fce0f1501b12b54c0961802ff10b4b5f24a1a33d.zip
mac80211: Update to version 5.8
The removed patches were applied upstream. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/subsys/305-mac80211-improve-AQL-tx-airtime-estimation.patch')
-rw-r--r--package/kernel/mac80211/patches/subsys/305-mac80211-improve-AQL-tx-airtime-estimation.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/subsys/305-mac80211-improve-AQL-tx-airtime-estimation.patch b/package/kernel/mac80211/patches/subsys/305-mac80211-improve-AQL-tx-airtime-estimation.patch
index f344281439..bee43a60fa 100644
--- a/package/kernel/mac80211/patches/subsys/305-mac80211-improve-AQL-tx-airtime-estimation.patch
+++ b/package/kernel/mac80211/patches/subsys/305-mac80211-improve-AQL-tx-airtime-estimation.patch
@@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!conf)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
-@@ -2278,7 +2278,7 @@ extern const struct ethtool_ops ieee8021
+@@ -2294,7 +2294,7 @@ extern const struct ethtool_ops ieee8021
u32 ieee80211_calc_expected_tx_airtime(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
struct ieee80211_sta *pubsta,
@@ -66,7 +66,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#else
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
-@@ -3694,10 +3694,11 @@ encap_out:
+@@ -3707,10 +3707,11 @@ encap_out:
if (vif &&
wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL)) {