From: Helmut Schaa <helmut.schaa@googlemail.com>
Date: Tue, 27 Nov 2012 17:03:13 +0000 (+0100)
Subject: mac80211: don't reinit rate control when mesh sta exists
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=59cf1d65f7d69739a29a16fe678ebc4e1215e9c0;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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 <emanuel.taube@gmail.com>
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index ca52dfdd5375..4b274e9c91a5 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -391,7 +391,8 @@ static struct sta_info *mesh_peer_init(struct ieee80211_sub_if_data *sdata,
 		sta->ch_width = chandef.width;
 	}
 
-	rate_control_rate_init(sta);
+	if (insert)
+		rate_control_rate_init(sta);
 	spin_unlock_bh(&sta->lock);
 
 	if (insert && sta_info_insert(sta))