diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-03-28 16:00:43 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-04-06 16:31:04 +0200 |
| commit | 3183430df4018b6976a286a1103356e77ce5c037 (patch) | |
| tree | 826654b81f3cb0c74d5b99624d05b1d15fed0e5c /package/kernel/mac80211/patches/subsys/322-mac80211-Add-airtime-accounting-and-scheduling-to-TX.patch | |
| parent | 4ebd66d7a996b8b5ba05a759eedfba03adb37e7f (diff) | |
| download | upstream-3183430df4018b6976a286a1103356e77ce5c037.tar.gz upstream-3183430df4018b6976a286a1103356e77ce5c037.tar.bz2 upstream-3183430df4018b6976a286a1103356e77ce5c037.zip | |
mac80211: update to version 4.19.32-1
The removed patches are now integrated in the upstream kernel.
Refresh all patches on top of the new backports release.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Tested-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Diffstat (limited to 'package/kernel/mac80211/patches/subsys/322-mac80211-Add-airtime-accounting-and-scheduling-to-TX.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/subsys/322-mac80211-Add-airtime-accounting-and-scheduling-to-TX.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/kernel/mac80211/patches/subsys/322-mac80211-Add-airtime-accounting-and-scheduling-to-TX.patch b/package/kernel/mac80211/patches/subsys/322-mac80211-Add-airtime-accounting-and-scheduling-to-TX.patch index b005060614..d4176eb491 100644 --- a/package/kernel/mac80211/patches/subsys/322-mac80211-Add-airtime-accounting-and-scheduling-to-TX.patch +++ b/package/kernel/mac80211/patches/subsys/322-mac80211-Add-airtime-accounting-and-scheduling-to-TX.patch @@ -125,7 +125,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> * The values are not guaranteed to be coherent with regard to each other, i.e. --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -1430,6 +1430,9 @@ static int sta_apply_parameters(struct i +@@ -1434,6 +1434,9 @@ static int sta_apply_parameters(struct i if (ieee80211_vif_is_mesh(&sdata->vif)) sta_apply_mesh_params(local, sta, params); @@ -422,8 +422,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> schedule_order); + if (!txqi) + return NULL; - -- if (!txqi || txqi->schedule_round == local->schedule_round[ac]) ++ + if (txqi->txq.sta) { + struct sta_info *sta = container_of(txqi->txq.sta, + struct sta_info, sta); @@ -437,7 +436,8 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> + } + } + -+ + +- if (!txqi || txqi->schedule_round == local->schedule_round[ac]) + if (txqi->schedule_round == local->schedule_round[ac]) return NULL; |