2012-06-07 14:01:26

by Sylvain Roger Rieunier

Subject: [PATCH] minstrel_ht: enable frame aggregation for fixed rate

Signed-off-by: Sylvain Roger Rieunier <[email protected]>
---
net/mac80211/rc80211_minstrel_ht.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
index 2d1acc6..e2aa93e 100644
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -626,8 +626,10 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,

#ifdef CONFIG_MAC80211_DEBUGFS
/* use fixed index if set */
- if (mp->fixed_rate_idx != -1)
- sample_idx = mp->fixed_rate_idx;
+ if (mp->fixed_rate_idx != -1) {
+ mi->max_tp_rate = mp->fixed_rate_idx;
+ sample_idx = -1;
+ }
#endif

if (sample_idx >= 0) {
--
1.7.9.5

2012-06-07 14:06:31

by Felix Fietkau

Subject: Re: [PATCH] minstrel_ht: enable frame aggregation for fixed rate

On 2012-06-07 4:01 PM, Sylvain Roger Rieunier wrote:
> Signed-off-by: Sylvain Roger Rieunier <[email protected]>
> ---
> net/mac80211/rc80211_minstrel_ht.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
> index 2d1acc6..e2aa93e 100644
> --- a/net/mac80211/rc80211_minstrel_ht.c
> +++ b/net/mac80211/rc80211_minstrel_ht.c
> @@ -626,8 +626,10 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
>
> #ifdef CONFIG_MAC80211_DEBUGFS
> /* use fixed index if set */
> - if (mp->fixed_rate_idx != -1)
> - sample_idx = mp->fixed_rate_idx;
> + if (mp->fixed_rate_idx != -1) {
> + mi->max_tp_rate = mp->fixed_rate_idx;
> + sample_idx = -1;
> + }
> #endif
I just noticed another issue, you should prevent minstrel_ht from
setting up the alternate retry chains if fixed rate is set, otherwise it
won't always use the rate you configured.

- Felix