mac80211: update to version 4.19.32-1

[openwrt/staging/rmilecki.git] / package / kernel / mac80211 / patches / subsys / 322-mac80211-Add-airtime-accounting-and-scheduling-to-TX.patch

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 b0050606144f64fb006b427d72f09290220e69eb..d4176eb491451b3b7b324dde5984a29fa145bab2 100644 (file)
--- 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;