2014-09-29 00:37:08

by Karl Beldan

[permalink] [raw]
Subject: [PATCH] mac80211: minstrel_ht: fix MCS_GROUP_RATES usage

From: Karl Beldan <[email protected]>

Commit 4441e8e9 ("mac80211: improve minstrel_ht rate sorting by
throughput & probability") replaced the constant 8 with MCS_GROUP_RATES
when getting the number of streams of an HT MCS. See commit 7a5e3fa2
("mac80211: minstrel_ht: replace some occurences of MCS_GROUP_RATES").

Signed-off-by: Karl Beldan <[email protected]>
---
net/mac80211/rc80211_minstrel_ht.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
index df90ce2..17ef54a 100644
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -135,7 +135,7 @@ minstrel_ht_update_rates(struct minstrel_priv *mp, struct minstrel_ht_sta *mi);
static int
minstrel_ht_get_group_idx(struct ieee80211_tx_rate *rate)
{
- return GROUP_IDX((rate->idx / MCS_GROUP_RATES) + 1,
+ return GROUP_IDX((rate->idx / 8) + 1,
!!(rate->flags & IEEE80211_TX_RC_SHORT_GI),
!!(rate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH));
}
--
2.0.1



2014-10-09 12:59:54

by Karl Beldan

[permalink] [raw]
Subject: Re: [PATCH] mac80211: minstrel_ht: fix MCS_GROUP_RATES usage

On Thu, Oct 09, 2014 at 10:58:21AM +0200, Johannes Berg wrote:
> On Mon, 2014-09-29 at 02:36 +0200, Karl Beldan wrote:
> > From: Karl Beldan <[email protected]>
> >
> > Commit 4441e8e9 ("mac80211: improve minstrel_ht rate sorting by
> > throughput & probability")
>
> That commit ID doesn't exist? Anyway, I fixed it.
>
> I applied the patch - but to mac80211-next since presumably you want to
> build on this and it doesn't matter much on mac80211.
>
Thanks, this was a locally git-applied commit ID.

Karl

2014-10-09 08:58:24

by Johannes Berg

[permalink] [raw]
Subject: Re: [PATCH] mac80211: minstrel_ht: fix MCS_GROUP_RATES usage

On Mon, 2014-09-29 at 02:36 +0200, Karl Beldan wrote:
> From: Karl Beldan <[email protected]>
>
> Commit 4441e8e9 ("mac80211: improve minstrel_ht rate sorting by
> throughput & probability")

That commit ID doesn't exist? Anyway, I fixed it.

I applied the patch - but to mac80211-next since presumably you want to
build on this and it doesn't matter much on mac80211.

johannes