diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-04-28 23:56:33 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-05-21 14:39:34 +0200 |
commit | a4b50c4bce7b015c9d7c7d599ea29994a55f3f1f (patch) | |
tree | b11900bac84604a71fe59a3ccac678f81289fd47 /package/kernel/mac80211/patches/subsys/313-mac80211-Turn-AQL-into-an-NL80211_EXT_FEATURE.patch | |
parent | 6593ea23e5173861e44f5f6a6fe3e7e6c3978f17 (diff) | |
download | upstream-a4b50c4bce7b015c9d7c7d599ea29994a55f3f1f.tar.gz upstream-a4b50c4bce7b015c9d7c7d599ea29994a55f3f1f.tar.bz2 upstream-a4b50c4bce7b015c9d7c7d599ea29994a55f3f1f.zip |
mac80211: Update to version 5.4.36-1
This updates the mac80211 backport to the latest minor version.
The removed patch was a backport from the upstream kernel which is now
integrated.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/subsys/313-mac80211-Turn-AQL-into-an-NL80211_EXT_FEATURE.patch')
-rw-r--r-- | package/kernel/mac80211/patches/subsys/313-mac80211-Turn-AQL-into-an-NL80211_EXT_FEATURE.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/package/kernel/mac80211/patches/subsys/313-mac80211-Turn-AQL-into-an-NL80211_EXT_FEATURE.patch b/package/kernel/mac80211/patches/subsys/313-mac80211-Turn-AQL-into-an-NL80211_EXT_FEATURE.patch index 9129560f24..389f2ae225 100644 --- a/package/kernel/mac80211/patches/subsys/313-mac80211-Turn-AQL-into-an-NL80211_EXT_FEATURE.patch +++ b/package/kernel/mac80211/patches/subsys/313-mac80211-Turn-AQL-into-an-NL80211_EXT_FEATURE.patch @@ -64,7 +64,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> NUM_NL80211_EXT_FEATURES, --- a/net/mac80211/debugfs_sta.c +++ b/net/mac80211/debugfs_sta.c -@@ -201,8 +201,6 @@ static ssize_t sta_airtime_read(struct f +@@ -202,8 +202,6 @@ static ssize_t sta_airtime_read(struct f char *buf = kzalloc(bufsz, GFP_KERNEL), *p = buf; u64 rx_airtime = 0, tx_airtime = 0; s64 deficit[IEEE80211_NUM_ACS]; @@ -73,7 +73,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> ssize_t rv; int ac; -@@ -214,6 +212,56 @@ static ssize_t sta_airtime_read(struct f +@@ -215,6 +213,56 @@ static ssize_t sta_airtime_read(struct f rx_airtime += sta->airtime[ac].rx_airtime; tx_airtime += sta->airtime[ac].tx_airtime; deficit[ac] = sta->airtime[ac].deficit; @@ -130,7 +130,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> q_limit_l[ac] = sta->airtime[ac].aql_limit_low; q_limit_h[ac] = sta->airtime[ac].aql_limit_high; spin_unlock_bh(&local->active_txq_lock[ac]); -@@ -221,12 +269,8 @@ static ssize_t sta_airtime_read(struct f +@@ -222,12 +270,8 @@ static ssize_t sta_airtime_read(struct f } p += scnprintf(p, bufsz + buf - p, @@ -143,7 +143,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> q_depth[0], q_depth[1], q_depth[2], q_depth[3], q_limit_l[0], q_limit_h[0], q_limit_l[1], q_limit_h[1], q_limit_l[2], q_limit_h[2], q_limit_l[3], q_limit_h[3]), -@@ -236,11 +280,10 @@ static ssize_t sta_airtime_read(struct f +@@ -237,11 +281,10 @@ static ssize_t sta_airtime_read(struct f return rv; } @@ -156,7 +156,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> u32 ac, q_limit_l, q_limit_h; char _buf[100] = {}, *buf = _buf; -@@ -251,7 +294,7 @@ static ssize_t sta_airtime_write(struct +@@ -252,7 +295,7 @@ static ssize_t sta_airtime_write(struct return -EFAULT; buf[sizeof(_buf) - 1] = '\0'; @@ -165,7 +165,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> != 3) return -EINVAL; -@@ -261,17 +304,10 @@ static ssize_t sta_airtime_write(struct +@@ -262,17 +305,10 @@ static ssize_t sta_airtime_write(struct sta->airtime[ac].aql_limit_low = q_limit_l; sta->airtime[ac].aql_limit_high = q_limit_h; @@ -185,7 +185,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf, size_t count, loff_t *ppos) -@@ -1001,6 +1037,10 @@ void ieee80211_sta_debugfs_add(struct st +@@ -1002,6 +1038,10 @@ void ieee80211_sta_debugfs_add(struct st NL80211_EXT_FEATURE_AIRTIME_FAIRNESS)) DEBUGFS_ADD(airtime); @@ -211,7 +211,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c -@@ -1917,6 +1917,9 @@ void ieee80211_sta_update_pending_airtim +@@ -1922,6 +1922,9 @@ void ieee80211_sta_update_pending_airtim { int tx_pending; @@ -223,7 +223,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> atomic_add(tx_airtime, --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h -@@ -127,7 +127,6 @@ enum ieee80211_agg_stop_reason { +@@ -128,7 +128,6 @@ enum ieee80211_agg_stop_reason { /* Debugfs flags to enable/disable use of RX/TX airtime in scheduler */ #define AIRTIME_USE_TX BIT(0) #define AIRTIME_USE_RX BIT(1) @@ -233,7 +233,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> u64 rx_airtime; --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -3667,7 +3667,7 @@ begin: +@@ -3691,7 +3691,7 @@ begin: IEEE80211_SKB_CB(skb)->control.vif = vif; @@ -242,7 +242,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> u32 airtime; airtime = ieee80211_calc_expected_tx_airtime(hw, vif, txq->sta, -@@ -3789,7 +3789,7 @@ bool ieee80211_txq_airtime_check(struct +@@ -3813,7 +3813,7 @@ bool ieee80211_txq_airtime_check(struct struct sta_info *sta; struct ieee80211_local *local = hw_to_local(hw); |