LinuxLists.cc - [PATCH] mac80211: minstrel

2013-11-13 17:41:30

Subject: [PATCH] mac80211: minstrel_ht: fix rates selection

2013-11-13 22:03:53

Subject: Re: [PATCH] mac80211: minstrel_ht: fix rates selection

On Wed, Nov 13, 2013 at 10:20:49PM +0100, Felix Fietkau wrote:
> On 2013-11-13 18:41, Karl Beldan wrote:
> > From: Karl Beldan <[email protected]>
> >
> > When initializing rates selections starting indexes upon stats update,
> > the minstrel_sta->max_* rates should be 'group * MCS_GROUP_RATES + i'
> > not 'i'. This affects settings where one of the peers does not support
> > any of the rates of the group 0 (i.e. when ht_cap.mcs.rx_mask[0] == 0).
> >
> > Signed-off-by: Karl Beldan <[email protected]>
> > ---
> > net/mac80211/rc80211_minstrel_ht.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
> > index 88c932e..6c173a2 100644
> > --- a/net/mac80211/rc80211_minstrel_ht.c
> > +++ b/net/mac80211/rc80211_minstrel_ht.c
> > @@ -390,7 +390,8 @@ minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)
> > mg->max_prob_rate = i;
> > if (!mi_rates_valid) {
> > mi->max_tp_rate = mi->max_tp_rate2 =
> > - mi->max_prob_rate = i;
> > + mi->max_prob_rate =
> > + group * MCS_GROUP_RATES + i;
> How about moving the 'index = ...' line further up and using that
> instead of duplicating it?
>
D'ohf course.

Karl

2013-11-17 09:31:14

by Johannes Berg

[permalink] [raw]

Subject: Re: [PATCH v2] mac80211: minstrel_ht: fix rates selection

On Wed, 2013-11-13 at 23:07 +0100, Karl Beldan wrote:
> From: Karl Beldan <[email protected]>
>
> When initializing rates selections starting indexes upon stats update,
> the minstrel_sta->max_* rates should be 'group * MCS_GROUP_RATES + i'
> not 'i'. This affects settings where one of the peers does not support
> any of the rates of the group 0 (i.e. when ht_cap.mcs.rx_mask[0] == 0).

Applied.

johannes

2013-11-13 22:07:44

by Karl Beldan

[permalink] [raw]

Subject: [PATCH v2] mac80211: minstrel_ht: fix rates selection

From: Karl Beldan <[email protected]>

When initializing rates selections starting indexes upon stats update,
the minstrel_sta->max_* rates should be 'group * MCS_GROUP_RATES + i'
not 'i'. This affects settings where one of the peers does not support
any of the rates of the group 0 (i.e. when ht_cap.mcs.rx_mask[0] == 0).

Signed-off-by: Karl Beldan <[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 53db728..e2a57e2 100644
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -277,13 +277,15 @@ minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)
if (!(mg->supported & BIT(i)))
continue;

+ index = MCS_GROUP_RATES * group + i;
+
/* initialize rates selections starting indexes */
if (!mg_rates_valid) {
mg->max_tp_rate = mg->max_tp_rate2 =
mg->max_prob_rate = i;
if (!mi_rates_valid) {
mi->max_tp_rate = mi->max_tp_rate2 =
- mi->max_prob_rate = i;
+ mi->max_prob_rate = index;
mi_rates_valid = true;
}
mg_rates_valid = true;
@@ -291,7 +293,6 @@ minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)

mr = &mg->rates[i];
mr->retry_updated = false;
- index = MCS_GROUP_RATES * group + i;
minstrel_calc_rate_ewma(mr);
minstrel_ht_calc_tp(mi, group, i);

--
1.8.2

2013-11-13 21:20:53

by Felix Fietkau

[permalink] [raw]

Subject: Re: [PATCH] mac80211: minstrel_ht: fix rates selection

On 2013-11-13 18:41, Karl Beldan wrote:
> From: Karl Beldan <[email protected]>
>
> When initializing rates selections starting indexes upon stats update,
> the minstrel_sta->max_* rates should be 'group * MCS_GROUP_RATES + i'
> not 'i'. This affects settings where one of the peers does not support
> any of the rates of the group 0 (i.e. when ht_cap.mcs.rx_mask[0] == 0).
>
> Signed-off-by: Karl Beldan <[email protected]>
> ---
> net/mac80211/rc80211_minstrel_ht.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
> index 88c932e..6c173a2 100644
> --- a/net/mac80211/rc80211_minstrel_ht.c
> +++ b/net/mac80211/rc80211_minstrel_ht.c
> @@ -390,7 +390,8 @@ minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)
> mg->max_prob_rate = i;
> if (!mi_rates_valid) {
> mi->max_tp_rate = mi->max_tp_rate2 =
> - mi->max_prob_rate = i;
> + mi->max_prob_rate =
> + group * MCS_GROUP_RATES + i;
How about moving the 'index = ...' line further up and using that
instead of duplicating it?

- Felix

2013-11-13 22:11:44

by Felix Fietkau

[permalink] [raw]

Subject: Re: [PATCH v2] mac80211: minstrel_ht: fix rates selection

On 2013-11-13 23:07, Karl Beldan wrote:
> From: Karl Beldan <[email protected]>
>
> When initializing rates selections starting indexes upon stats update,
> the minstrel_sta->max_* rates should be 'group * MCS_GROUP_RATES + i'
> not 'i'. This affects settings where one of the peers does not support
> any of the rates of the group 0 (i.e. when ht_cap.mcs.rx_mask[0] == 0).
>
> Signed-off-by: Karl Beldan <[email protected]>
Acked-by: Felix Fietkau <[email protected]>