2014-05-19 09:28:08

by Johannes Berg

Subject: [PATCH] mac80211: minstrel-ht: small clarifications

From: Johannes Berg <[email protected]>

Antonio and I were looking over this code and some things
didn't immediately make sense, so we came up with two small
clarifications.

Signed-off-by: Johannes Berg <[email protected]>
---
net/mac80211/rc80211_minstrel_ht.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
index bccaf854a309..4e916ad51a20 100644
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -22,7 +22,7 @@
#define MCS_NBITS (AVG_PKT_SIZE << 3)

/* Number of symbols for a packet with (bps) bits per symbol */
-#define MCS_NSYMS(bps) ((MCS_NBITS + (bps) - 1) / (bps))
+#define MCS_NSYMS(bps) DIV_ROUND_UP(MCS_NBITS, (bps))

/* Transmission time (nanoseconds) for a packet containing (syms) symbols */
#define MCS_SYMBOL_TIME(sgi, syms) \
@@ -226,8 +226,9 @@ minstrel_ht_calc_tp(struct minstrel_ht_sta *mi, int group, int rate)
nsecs = 1000 * mi->overhead / MINSTREL_TRUNC(mi->avg_ampdu_len);

nsecs += minstrel_mcs_groups[group].duration[rate];
- tp = 1000000 * ((prob * 1000) / nsecs);

+ /* prob is scaled - see MINSTREL_FRAC above */
+ tp = 1000000 * ((prob * 1000) / nsecs);
mr->cur_tp = MINSTREL_TRUNC(tp);
}

--
2.0.0.rc0

2014-05-19 21:38:37

by Felix Fietkau

Subject: Re: [PATCH] mac80211: minstrel-ht: small clarifications

On 2014-05-19 11:27, Johannes Berg wrote:
> From: Johannes Berg <[email protected]>
>
> Antonio and I were looking over this code and some things
> didn't immediately make sense, so we came up with two small
> clarifications.
>
> Signed-off-by: Johannes Berg <[email protected]>
Acked-by: Felix Fietkau <[email protected]>