when i was trying fixed rate in minstrel_ht, frame aggregation
was not working. so i fix it.
Signed-off-by: Sylvain Roger Rieunier <[email protected]>
---
net/mac80211/rc80211_minstrel_ht.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
index 2d1acc6..342ec71 100644
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -626,8 +626,11 @@ 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;
+ mi->max_tp_rate2 = mp->fixed_rate_idx;
+ sample_idx = -1;
+ }
#endif
if (sample_idx >= 0) {
--
1.7.9.5
On Fri, 2012-06-08 at 09:44 +0200, Sylvain Roger Rieunier wrote:
> when i was trying fixed rate in minstrel_ht, frame aggregation
> was not working. so i fix it.
Please explain in the commit log why it was broken and how the fix
works, rather than just saying "I fix[ed] it"
> Signed-off-by: Sylvain Roger Rieunier <[email protected]>
> ---
> net/mac80211/rc80211_minstrel_ht.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
> index 2d1acc6..342ec71 100644
> --- a/net/mac80211/rc80211_minstrel_ht.c
> +++ b/net/mac80211/rc80211_minstrel_ht.c
> @@ -626,8 +626,11 @@ 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;
> + mi->max_tp_rate2 = mp->fixed_rate_idx;
> + sample_idx = -1;
> + }
> #endif
>
> if (sample_idx >= 0) {
Dear Johannes ans Felix,
This is my new change log version :
"This patch adds frame aggregation for fixed rate mode through debugfs.
Instead of using sample_idx, which set IEEE80211_TX_CTL_RATE_CTRL_PROBE
flag,
which disabled frame aggregation, we set max_tp_rate and max_tp_rate2 which
do not disable frame aggregation."
What's is your opinion?
Sylvain
Le 11/06/2012 16:58, Johannes Berg a écrit :
> On Mon, 2012-06-11 at 16:51 +0200, sylvain_gmail wrote:
>> Dear Johannes and Felix ,
>>
>> Here is the description of my patch that I can offer :
>>
>> "After trying to fix rate control with minstrel_ht. I realized that,
>> that fix rate was not allowed to make frames aggregation.
>> This was due to enable IEEE80211_TX_CTL_RATE_CTRL_PROBE flag of the
>> ieee80211_tx_info structure.
>> Because when IEEE80211_TX_CTL_RATE_CTRL_PROBE flag is set frame
>> aggregation is disabled.
>> So instead of used sample_idx, who set
>> IEEE80211_TX_CTL_RATE_CTRL_PROBE flag. I suggest using max_tp_rate and
>> max_tp_rate2 which do not disabled frame aggregation."
>>
>> what is your opinion?
> Makes more sense than before, but isn't really a viable changelog entry
> yet :)
>
> johannes
>
On Mon, 2012-06-11 at 16:51 +0200, sylvain_gmail wrote:
> Dear Johannes and Felix ,
>
> Here is the description of my patch that I can offer :
>
> "After trying to fix rate control with minstrel_ht. I realized that,
> that fix rate was not allowed to make frames aggregation.
> This was due to enable IEEE80211_TX_CTL_RATE_CTRL_PROBE flag of the
> ieee80211_tx_info structure.
> Because when IEEE80211_TX_CTL_RATE_CTRL_PROBE flag is set frame
> aggregation is disabled.
> So instead of used sample_idx, who set
> IEEE80211_TX_CTL_RATE_CTRL_PROBE flag. I suggest using max_tp_rate and
> max_tp_rate2 which do not disabled frame aggregation."
>
> what is your opinion?
Makes more sense than before, but isn't really a viable changelog entry
yet :)
johannes