Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / net / mac80211 / rc80211_minstrel_debugfs.c

diff --git a/net/mac80211/rc80211_minstrel_debugfs.c b/net/mac80211/rc80211_minstrel_debugfs.c
index d5a56226e675970c3a396df9d73b22135dabc39e..d1048348d399697306993b47c45988ef8602f96b 100644 (file)
--- a/net/mac80211/rc80211_minstrel_debugfs.c
+++ b/net/mac80211/rc80211_minstrel_debugfs.c
@@ -73,15 +73,17 @@ minstrel_stats_open(struct inode *inode, struct file *file)
        for (i = 0; i < mi->n_rates; i++) {
                struct minstrel_rate *mr = &mi->r[i];
 
-               *(p++) = (i == mi->max_tp_rate) ? 'T' : ' ';
-               *(p++) = (i == mi->max_tp_rate2) ? 't' : ' ';
+               *(p++) = (i == mi->max_tp_rate[0]) ? 'A' : ' ';
+               *(p++) = (i == mi->max_tp_rate[1]) ? 'B' : ' ';
+               *(p++) = (i == mi->max_tp_rate[2]) ? 'C' : ' ';
+               *(p++) = (i == mi->max_tp_rate[3]) ? 'D' : ' ';
                *(p++) = (i == mi->max_prob_rate) ? 'P' : ' ';
                p += sprintf(p, "%3u%s", mr->bitrate / 2,
                                (mr->bitrate & 1 ? ".5" : "  "));
 
-               tp = mr->cur_tp / ((18000 << 10) / 96);
-               prob = mr->cur_prob / 18;
-               eprob = mr->probability / 18;
+               tp = MINSTREL_TRUNC(mr->cur_tp / 10);
+               prob = MINSTREL_TRUNC(mr->cur_prob * 1000);
+               eprob = MINSTREL_TRUNC(mr->probability * 1000);
 
                p += sprintf(p, "  %6u.%1u   %6u.%1u   %6u.%1u        "
                                "%3u(%3u)   %8llu    %8llu\n",