2012-11-27 17:03:33

by Helmut Schaa

Subject: [PATCH] mac80211: Don't reinit rate control when mesh sta exists

This fixes some unintended resets of the rate control statistics
when minstrel_ht is used resulting in non-optimal throughput on mesh
links.

Tested-by: Emanuel Taube <[email protected]>
Signed-off-by: Helmut Schaa <[email protected]>
---
net/mac80211/mesh_plink.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index 234fe75..0327755 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -394,7 +394,9 @@ static struct sta_info *mesh_peer_init(struct ieee80211_sub_if_data *sdata,
ieee80211_ht_oper_to_channel_type(elems->ht_operation);
}

- rate_control_rate_init(sta);
+ if (insert)
+ rate_control_rate_init(sta);
+
spin_unlock_bh(&sta->lock);

if (insert && sta_info_insert(sta))
--
1.7.7

2012-11-28 13:03:22

by Johannes Berg

Subject: Re: [PATCH] mac80211: Don't reinit rate control when mesh sta exists

On Tue, 2012-11-27 at 18:03 +0100, Helmut Schaa wrote:
> This fixes some unintended resets of the rate control statistics
> when minstrel_ht is used resulting in non-optimal throughput on mesh
> links.

Applied.

johannes