2015-09-23 08:30:48

by Johannes Berg

Subject: [PATCH] mac80211: minstrel[_ht]: remove non-ascii debugfs characters

From: Johannes Berg <[email protected]>

Replace the average symbol by "avg" to avoid being warned about the
non-ASCII symbol all the time, line up the columns properly.

(I changed my mind - the warnings are getting annoying)

Signed-off-by: Johannes Berg <[email protected]>
---
net/mac80211/rc80211_minstrel_debugfs.c | 12 +++++-------
net/mac80211/rc80211_minstrel_ht_debugfs.c | 12 +++++-------
2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/net/mac80211/rc80211_minstrel_debugfs.c b/net/mac80211/rc80211_minstrel_debugfs.c
index 1db5f7c3318a..820b0abc9c0d 100644
--- a/net/mac80211/rc80211_minstrel_debugfs.c
+++ b/net/mac80211/rc80211_minstrel_debugfs.c
@@ -85,12 +85,10 @@ minstrel_stats_open(struct inode *inode, struct file *file)
file->private_data = ms;
p = ms->buf;
p += sprintf(p, "\n");
- p += sprintf(p, "best __________rate_________ ______"
- "statistics______ ________last_______ "
- "______sum-of________\n");
- p += sprintf(p, "rate [name idx airtime max_tp] [ ø(tp) ø(prob) "
- "sd(prob)] [prob.|retry|suc|att] "
- "[#success | #attempts]\n");
+ p += sprintf(p,
+ "best __________rate_________ ________statistics________ ________last_______ ______sum-of________\n");
+ p += sprintf(p,
+ "rate [name idx airtime max_tp] [avg(tp) avg(prob) sd(prob)] [prob.|retry|suc|att] [#success | #attempts]\n");

for (i = 0; i < mi->n_rates; i++) {
struct minstrel_rate *mr = &mi->r[i];
@@ -112,7 +110,7 @@ minstrel_stats_open(struct inode *inode, struct file *file)
prob = MINSTREL_TRUNC(mrs->cur_prob * 1000);
eprob = MINSTREL_TRUNC(mrs->prob_ewma * 1000);

- p += sprintf(p, "%4u.%1u %4u.%1u %3u.%1u %3u.%1u"
+ p += sprintf(p, "%4u.%1u %4u.%1u %3u.%1u %3u.%1u"
" %3u.%1u %3u %3u %-3u "
"%9llu %-9llu\n",
tp_max / 10, tp_max % 10,
diff --git a/net/mac80211/rc80211_minstrel_ht_debugfs.c b/net/mac80211/rc80211_minstrel_ht_debugfs.c
index 6822ce0f95e5..5320e35ed3d0 100644
--- a/net/mac80211/rc80211_minstrel_ht_debugfs.c
+++ b/net/mac80211/rc80211_minstrel_ht_debugfs.c
@@ -86,7 +86,7 @@ minstrel_ht_stats_dump(struct minstrel_ht_sta *mi, int i, char *p)
prob = MINSTREL_TRUNC(mrs->cur_prob * 1000);
eprob = MINSTREL_TRUNC(mrs->prob_ewma * 1000);

- p += sprintf(p, "%4u.%1u %4u.%1u %3u.%1u %3u.%1u"
+ p += sprintf(p, "%4u.%1u %4u.%1u %3u.%1u %3u.%1u"
" %3u.%1u %3u %3u %-3u "
"%9llu %-9llu\n",
tp_max / 10, tp_max % 10,
@@ -129,12 +129,10 @@ minstrel_ht_stats_open(struct inode *inode, struct file *file)
p = ms->buf;

p += sprintf(p, "\n");
- p += sprintf(p, " best ____________rate__________ "
- "______statistics______ ________last_______ "
- "______sum-of________\n");
- p += sprintf(p, "mode guard # rate [name idx airtime max_tp] "
- "[ ø(tp) ø(prob) sd(prob)] [prob.|retry|suc|att] [#success | "
- "#attempts]\n");
+ p += sprintf(p,
+ " best ____________rate__________ ________statistics________ ________last_______ ______sum-of________\n");
+ p += sprintf(p,
+ "mode guard # rate [name idx airtime max_tp] [avg(tp) avg(prob) sd(prob)] [prob.|retry|suc|att] [#success | #attempts]\n");

p = minstrel_ht_stats_dump(mi, MINSTREL_CCK_GROUP, p);
for (i = 0; i < MINSTREL_CCK_GROUP; i++)
--
2.5.1

2015-09-23 08:59:12

by Bastian Bittorf

Subject: Re: [PATCH] mac80211: minstrel[_ht]: remove non-ascii debugfs characters

* Johannes Berg <[email protected]> [23.09.2015 10:44]:
> Replace the average symbol by "avg" to avoid being warned about the
> non-ASCII symbol all the time, line up the columns properly.

who warns you? the compiler? the terminal?

bye, bastian

2015-09-23 09:00:49

by Johannes Berg

Subject: Re: [PATCH] mac80211: minstrel[_ht]: remove non-ascii debugfs characters

On Wed, 2015-09-23 at 10:49 +0200, Bastian Bittorf wrote:
> * Johannes Berg <[email protected]> [23.09.2015 10:44]:
> > Replace the average symbol by "avg" to avoid being warned about the
> > non-ASCII symbol all the time, line up the columns properly.
>
> who warns you? the compiler? the terminal?
>

sparse, or perhaps smatch? either way, those tools are crucial for my
workflow, and there seems to be very little downside to the change.

johannes

2015-09-23 09:37:52

by Bastian Bittorf

Subject: Re: [PATCH] mac80211: minstrel[_ht]: remove non-ascii debugfs characters

* Johannes Berg <[email protected]> [23.09.2015 11:03]:
> > > non-ASCII symbol all the time, line up the columns properly.
> >
> > who warns you? the compiler? the terminal?
>
> sparse, or perhaps smatch? either way, those tools are crucial for my
> workflow, and there seems to be very little downside to the change.

thanks for making this clear. bye, bastian