mac80211: update to version based on 4.19-rc4

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / subsys / 370-mac80211-minstrel-remove-unnecessary-debugfs-cleanup.patch

diff --git a/package/kernel/mac80211/patches/subsys/370-mac80211-minstrel-remove-unnecessary-debugfs-cleanup.patch b/package/kernel/mac80211/patches/subsys/370-mac80211-minstrel-remove-unnecessary-debugfs-cleanup.patch
index c871655a381616ec04b0c8dc216e684d32c0ef0a..95d4f294aaffdddd477e89522cc3004a845b2b5c 100644 (file)
--- a/package/kernel/mac80211/patches/subsys/370-mac80211-minstrel-remove-unnecessary-debugfs-cleanup.patch
+++ b/package/kernel/mac80211/patches/subsys/370-mac80211-minstrel-remove-unnecessary-debugfs-cleanup.patch
@@ -8,10 +8,8 @@ debugfs entries are cleaned up by debugfs_remove_recursive already.
 Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
-Index: backports-v4.18-rc7/net/mac80211/rc80211_minstrel.c
-===================================================================
---- backports-v4.18-rc7.orig/net/mac80211/rc80211_minstrel.c
-+++ backports-v4.18-rc7/net/mac80211/rc80211_minstrel.c
+--- a/net/mac80211/rc80211_minstrel.c
++++ b/net/mac80211/rc80211_minstrel.c
 @@ -689,8 +689,8 @@ minstrel_alloc(struct ieee80211_hw *hw,
  
  #ifdef CPTCFG_MAC80211_DEBUGFS
@@ -41,10 +39,8 @@ Index: backports-v4.18-rc7/net/mac80211/rc80211_minstrel.c
  #endif
        .get_expected_throughput = minstrel_get_expected_throughput,
  };
-Index: backports-v4.18-rc7/net/mac80211/rc80211_minstrel.h
-===================================================================
---- backports-v4.18-rc7.orig/net/mac80211/rc80211_minstrel.h
-+++ backports-v4.18-rc7/net/mac80211/rc80211_minstrel.h
+--- a/net/mac80211/rc80211_minstrel.h
++++ b/net/mac80211/rc80211_minstrel.h
 @@ -109,11 +109,6 @@ struct minstrel_sta_info {
  
        /* sampling table */
@@ -73,10 +69,8 @@ Index: backports-v4.18-rc7/net/mac80211/rc80211_minstrel.h
  
  /* Recalculate success probabilities and counters for a given rate using EWMA */
  void minstrel_calc_rate_stats(struct minstrel_rate_stats *mrs);
-Index: backports-v4.18-rc7/net/mac80211/rc80211_minstrel_debugfs.c
-===================================================================
---- backports-v4.18-rc7.orig/net/mac80211/rc80211_minstrel_debugfs.c
-+++ backports-v4.18-rc7/net/mac80211/rc80211_minstrel_debugfs.c
+--- a/net/mac80211/rc80211_minstrel_debugfs.c
++++ b/net/mac80211/rc80211_minstrel_debugfs.c
 @@ -214,19 +214,7 @@ minstrel_add_sta_debugfs(void *priv, voi
  {
        struct minstrel_sta_info *mi = priv_sta;
@@ -100,10 +94,8 @@ Index: backports-v4.18-rc7/net/mac80211/rc80211_minstrel_debugfs.c
 +      debugfs_create_file("rc_stats_csv", S_IRUGO, dir, mi,
 +                          &minstrel_stat_csv_fops);
  }
-Index: backports-v4.18-rc7/net/mac80211/rc80211_minstrel_ht.c
-===================================================================
---- backports-v4.18-rc7.orig/net/mac80211/rc80211_minstrel_ht.c
-+++ backports-v4.18-rc7/net/mac80211/rc80211_minstrel_ht.c
+--- a/net/mac80211/rc80211_minstrel_ht.c
++++ b/net/mac80211/rc80211_minstrel_ht.c
 @@ -1393,7 +1393,6 @@ static const struct rate_control_ops mac
        .free = minstrel_ht_free,
  #ifdef CPTCFG_MAC80211_DEBUGFS
@@ -112,10 +104,8 @@ Index: backports-v4.18-rc7/net/mac80211/rc80211_minstrel_ht.c
  #endif
        .get_expected_throughput = minstrel_ht_get_expected_throughput,
  };
-Index: backports-v4.18-rc7/net/mac80211/rc80211_minstrel_ht.h
-===================================================================
---- backports-v4.18-rc7.orig/net/mac80211/rc80211_minstrel_ht.h
-+++ backports-v4.18-rc7/net/mac80211/rc80211_minstrel_ht.h
+--- a/net/mac80211/rc80211_minstrel_ht.h
++++ b/net/mac80211/rc80211_minstrel_ht.h
 @@ -110,17 +110,12 @@ struct minstrel_ht_sta_priv {
                struct minstrel_ht_sta ht;
                struct minstrel_sta_info legacy;
@@ -134,10 +124,8 @@ Index: backports-v4.18-rc7/net/mac80211/rc80211_minstrel_ht.h
  int minstrel_ht_get_tp_avg(struct minstrel_ht_sta *mi, int group, int rate,
                           int prob_ewma);
  
-Index: backports-v4.18-rc7/net/mac80211/rc80211_minstrel_ht_debugfs.c
-===================================================================
---- backports-v4.18-rc7.orig/net/mac80211/rc80211_minstrel_ht_debugfs.c
-+++ backports-v4.18-rc7/net/mac80211/rc80211_minstrel_ht_debugfs.c
+--- a/net/mac80211/rc80211_minstrel_ht_debugfs.c
++++ b/net/mac80211/rc80211_minstrel_ht_debugfs.c
 @@ -303,17 +303,8 @@ minstrel_ht_add_sta_debugfs(void *priv,
  {
        struct minstrel_ht_sta_priv *msp = priv_sta;