151 lines
4.6 KiB
Diff
151 lines
4.6 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Sat, 10 Feb 2018 12:41:51 +0100
|
|
Subject: [PATCH] mac80211: minstrel: remove unnecessary debugfs cleanup
|
|
code
|
|
|
|
debugfs entries are cleaned up by debugfs_remove_recursive already.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- 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
|
|
mp->fixed_rate_idx = (u32) -1;
|
|
- mp->dbg_fixed_rate = debugfs_create_u32("fixed_rate_idx",
|
|
- 0666, debugfsdir, &mp->fixed_rate_idx);
|
|
+ debugfs_create_u32("fixed_rate_idx", S_IRUGO | S_IWUGO, debugfsdir,
|
|
+ &mp->fixed_rate_idx);
|
|
#endif
|
|
|
|
minstrel_init_cck_rates(mp);
|
|
@@ -701,9 +701,6 @@ minstrel_alloc(struct ieee80211_hw *hw,
|
|
static void
|
|
minstrel_free(void *priv)
|
|
{
|
|
-#ifdef CPTCFG_MAC80211_DEBUGFS
|
|
- debugfs_remove(((struct minstrel_priv *)priv)->dbg_fixed_rate);
|
|
-#endif
|
|
kfree(priv);
|
|
}
|
|
|
|
@@ -735,7 +732,6 @@ const struct rate_control_ops mac80211_m
|
|
.free_sta = minstrel_free_sta,
|
|
#ifdef CPTCFG_MAC80211_DEBUGFS
|
|
.add_sta_debugfs = minstrel_add_sta_debugfs,
|
|
- .remove_sta_debugfs = minstrel_remove_sta_debugfs,
|
|
#endif
|
|
.get_expected_throughput = minstrel_get_expected_throughput,
|
|
};
|
|
--- a/net/mac80211/rc80211_minstrel.h
|
|
+++ b/net/mac80211/rc80211_minstrel.h
|
|
@@ -109,11 +109,6 @@ struct minstrel_sta_info {
|
|
|
|
/* sampling table */
|
|
u8 *sample_table;
|
|
-
|
|
-#ifdef CPTCFG_MAC80211_DEBUGFS
|
|
- struct dentry *dbg_stats;
|
|
- struct dentry *dbg_stats_csv;
|
|
-#endif
|
|
};
|
|
|
|
struct minstrel_priv {
|
|
@@ -137,7 +132,6 @@ struct minstrel_priv {
|
|
* - setting will be applied on next update
|
|
*/
|
|
u32 fixed_rate_idx;
|
|
- struct dentry *dbg_fixed_rate;
|
|
#endif
|
|
};
|
|
|
|
@@ -156,7 +150,6 @@ minstrel_get_ewmsd10(struct minstrel_rat
|
|
|
|
extern const struct rate_control_ops mac80211_minstrel;
|
|
void minstrel_add_sta_debugfs(void *priv, void *priv_sta, struct dentry *dir);
|
|
-void minstrel_remove_sta_debugfs(void *priv, void *priv_sta);
|
|
|
|
/* Recalculate success probabilities and counters for a given rate using EWMA */
|
|
void minstrel_calc_rate_stats(struct minstrel_rate_stats *mrs);
|
|
--- 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;
|
|
|
|
- mi->dbg_stats = debugfs_create_file("rc_stats", 0444, dir, mi,
|
|
- &minstrel_stat_fops);
|
|
-
|
|
- mi->dbg_stats_csv = debugfs_create_file("rc_stats_csv", 0444, dir, mi,
|
|
- &minstrel_stat_csv_fops);
|
|
-}
|
|
-
|
|
-void
|
|
-minstrel_remove_sta_debugfs(void *priv, void *priv_sta)
|
|
-{
|
|
- struct minstrel_sta_info *mi = priv_sta;
|
|
-
|
|
- debugfs_remove(mi->dbg_stats);
|
|
-
|
|
- debugfs_remove(mi->dbg_stats_csv);
|
|
+ debugfs_create_file("rc_stats", S_IRUGO, dir, mi, &minstrel_stat_fops);
|
|
+ debugfs_create_file("rc_stats_csv", S_IRUGO, dir, mi,
|
|
+ &minstrel_stat_csv_fops);
|
|
}
|
|
--- 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
|
|
.add_sta_debugfs = minstrel_ht_add_sta_debugfs,
|
|
- .remove_sta_debugfs = minstrel_ht_remove_sta_debugfs,
|
|
#endif
|
|
.get_expected_throughput = minstrel_ht_get_expected_throughput,
|
|
};
|
|
--- 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;
|
|
};
|
|
-#ifdef CPTCFG_MAC80211_DEBUGFS
|
|
- struct dentry *dbg_stats;
|
|
- struct dentry *dbg_stats_csv;
|
|
-#endif
|
|
void *ratelist;
|
|
void *sample_table;
|
|
bool is_ht;
|
|
};
|
|
|
|
void minstrel_ht_add_sta_debugfs(void *priv, void *priv_sta, struct dentry *dir);
|
|
-void minstrel_ht_remove_sta_debugfs(void *priv, void *priv_sta);
|
|
int minstrel_ht_get_tp_avg(struct minstrel_ht_sta *mi, int group, int rate,
|
|
int prob_ewma);
|
|
|
|
--- 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;
|
|
|
|
- msp->dbg_stats = debugfs_create_file("rc_stats", 0444, dir, msp,
|
|
- &minstrel_ht_stat_fops);
|
|
- msp->dbg_stats_csv = debugfs_create_file("rc_stats_csv", 0444, dir, msp,
|
|
- &minstrel_ht_stat_csv_fops);
|
|
-}
|
|
-
|
|
-void
|
|
-minstrel_ht_remove_sta_debugfs(void *priv, void *priv_sta)
|
|
-{
|
|
- struct minstrel_ht_sta_priv *msp = priv_sta;
|
|
-
|
|
- debugfs_remove(msp->dbg_stats);
|
|
- debugfs_remove(msp->dbg_stats_csv);
|
|
+ debugfs_create_file("rc_stats", S_IRUGO, dir, msp,
|
|
+ &minstrel_ht_stat_fops);
|
|
+ debugfs_create_file("rc_stats_csv", S_IRUGO, dir, msp,
|
|
+ &minstrel_ht_stat_csv_fops);
|
|
}
|