rtl88x2CE_WiFi_linux add concurrent mode

hc

2024-09-20 cf4ce59b3b70238352c7f1729f0f7223214828ad

 kernel/net/mac80211/rc80211_minstrel_debugfs.c
..
..
@@ -54,22 +54,6 @@
54
54
 #include <net/mac80211.h>
55
55
 #include "rc80211_minstrel.h"
56
56
 
57
-ssize_t
58
-minstrel_stats_read(struct file *file, char __user *buf, size_t len, loff_t *ppos)
59
-{
60
-	struct minstrel_debugfs_info *ms;
61
-
62
-	ms = file->private_data;
63
-	return simple_read_from_buffer(buf, len, ppos, ms->buf, ms->len);
64
-}
65
-
66
-int
67
-minstrel_stats_release(struct inode *inode, struct file *file)
68
-{
69
-	kfree(file->private_data);
70
-	return 0;
71
-}
72
-
73
57
 int
74
58
 minstrel_stats_open(struct inode *inode, struct file *file)
75
59
 {
..
..
@@ -86,14 +70,13 @@
86
70
 	p = ms->buf;
87
71
 	p += sprintf(p, "\n");
88
72
 	p += sprintf(p,
89
-		     "best   __________rate_________    ________statistics________    ____last_____    ______sum-of________\n");
73
+		     "best   __________rate_________    ____statistics___    ____last_____    ______sum-of________\n");
90
74
 	p += sprintf(p,
91
-		     "rate  [name idx airtime max_tp]  [avg(tp) avg(prob) sd(prob)]  [retry|suc|att]  [#success | #attempts]\n");
75
+		     "rate  [name idx airtime max_tp]  [avg(tp) avg(prob)]  [retry|suc|att]  [#success | #attempts]\n");
92
76
 
93
77
 	for (i = 0; i < mi->n_rates; i++) {
94
78
 		struct minstrel_rate *mr = &mi->r[i];
95
79
 		struct minstrel_rate_stats *mrs = &mi->r[i].stats;
96
-		unsigned int prob_ewmsd;
97
80
 
98
81
 		*(p++) = (i == mi->max_tp_rate[0]) ? 'A' : ' ';
99
82
 		*(p++) = (i == mi->max_tp_rate[1]) ? 'B' : ' ';
..
..
@@ -107,17 +90,15 @@
107
90
 		p += sprintf(p, "%6u ", mr->perfect_tx_time);
108
91
 
109
92
 		tp_max = minstrel_get_tp_avg(mr, MINSTREL_FRAC(100,100));
110
-		tp_avg = minstrel_get_tp_avg(mr, mrs->prob_ewma);
111
-		eprob = MINSTREL_TRUNC(mrs->prob_ewma * 1000);
112
-		prob_ewmsd = minstrel_get_ewmsd10(mrs);
93
+		tp_avg = minstrel_get_tp_avg(mr, mrs->prob_avg);
94
+		eprob = MINSTREL_TRUNC(mrs->prob_avg * 1000);
113
95
 
114
-		p += sprintf(p, "%4u.%1u    %4u.%1u     %3u.%1u    %3u.%1u"
96
+		p += sprintf(p, "%4u.%1u    %4u.%1u     %3u.%1u"
115
97
 				"     %3u   %3u %-3u   "
116
98
 				"%9llu   %-9llu\n",
117
99
 				tp_max / 10, tp_max % 10,
118
100
 				tp_avg / 10, tp_avg % 10,
119
101
 				eprob / 10, eprob % 10,
120
-				prob_ewmsd / 10, prob_ewmsd % 10,
121
102
 				mrs->retry_count,
122
103
 				mrs->last_success,
123
104
 				mrs->last_attempts,
..
..
@@ -134,14 +115,6 @@
134
115
 
135
116
 	return 0;
136
117
 }
137
-
138
-static const struct file_operations minstrel_stat_fops = {
139
-	.owner = THIS_MODULE,
140
-	.open = minstrel_stats_open,
141
-	.read = minstrel_stats_read,
142
-	.release = minstrel_stats_release,
143
-	.llseek = default_llseek,
144
-};
145
118
 
146
119
 int
147
120
 minstrel_stats_csv_open(struct inode *inode, struct file *file)
..
..
@@ -161,7 +134,6 @@
161
134
 	for (i = 0; i < mi->n_rates; i++) {
162
135
 		struct minstrel_rate *mr = &mi->r[i];
163
136
 		struct minstrel_rate_stats *mrs = &mi->r[i].stats;
164
-		unsigned int prob_ewmsd;
165
137
 
166
138
 		p += sprintf(p, "%s" ,((i == mi->max_tp_rate[0]) ? "A" : ""));
167
139
 		p += sprintf(p, "%s" ,((i == mi->max_tp_rate[1]) ? "B" : ""));
..
..
@@ -175,16 +147,14 @@
175
147
 		p += sprintf(p, "%u,",mr->perfect_tx_time);
176
148
 
177
149
 		tp_max = minstrel_get_tp_avg(mr, MINSTREL_FRAC(100,100));
178
-		tp_avg = minstrel_get_tp_avg(mr, mrs->prob_ewma);
179
-		eprob = MINSTREL_TRUNC(mrs->prob_ewma * 1000);
180
-		prob_ewmsd = minstrel_get_ewmsd10(mrs);
150
+		tp_avg = minstrel_get_tp_avg(mr, mrs->prob_avg);
151
+		eprob = MINSTREL_TRUNC(mrs->prob_avg * 1000);
181
152
 
182
-		p += sprintf(p, "%u.%u,%u.%u,%u.%u,%u.%u,%u,%u,%u,"
153
+		p += sprintf(p, "%u.%u,%u.%u,%u.%u,%u,%u,%u,"
183
154
 				"%llu,%llu,%d,%d\n",
184
155
 				tp_max / 10, tp_max % 10,
185
156
 				tp_avg / 10, tp_avg % 10,
186
157
 				eprob / 10, eprob % 10,
187
-				prob_ewmsd / 10, prob_ewmsd % 10,
188
158
 				mrs->retry_count,
189
159
 				mrs->last_success,
190
160
 				mrs->last_attempts,
..
..
@@ -199,34 +169,4 @@
199
169
 	WARN_ON(ms->len + sizeof(*ms) > 2048);
200
170
 
201
171
 	return 0;
202
-}
203
-
204
-static const struct file_operations minstrel_stat_csv_fops = {
205
-	.owner = THIS_MODULE,
206
-	.open = minstrel_stats_csv_open,
207
-	.read = minstrel_stats_read,
208
-	.release = minstrel_stats_release,
209
-	.llseek = default_llseek,
210
-};
211
-
212
-void
213
-minstrel_add_sta_debugfs(void *priv, void *priv_sta, struct dentry *dir)
214
-{
215
-	struct minstrel_sta_info *mi = priv_sta;
216
-
217
-	mi->dbg_stats = debugfs_create_file("rc_stats", 0444, dir, mi,
218
-					    &minstrel_stat_fops);
219
-
220
-	mi->dbg_stats_csv = debugfs_create_file("rc_stats_csv", 0444, dir, mi,
221
-						&minstrel_stat_csv_fops);
222
-}
223
-
224
-void
225
-minstrel_remove_sta_debugfs(void *priv, void *priv_sta)
226
-{
227
-	struct minstrel_sta_info *mi = priv_sta;
228
-
229
-	debugfs_remove(mi->dbg_stats);
230
-
231
-	debugfs_remove(mi->dbg_stats_csv);
232
172
 }