aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorHelmut Schaa <helmut.schaa@googlemail.com>2012-11-27 18:03:13 +0100
committerJohannes Berg <johannes.berg@intel.com>2012-11-28 14:03:18 +0100
commit59cf1d65f7d69739a29a16fe678ebc4e1215e9c0 (patch)
tree3e5f44d27270731d5f9fdcb1305bc1ef74a9da33 /net/mac80211
parentmac80211: reject setting masked mac addresses (diff)
downloadlinux-dev-59cf1d65f7d69739a29a16fe678ebc4e1215e9c0.tar.xz
linux-dev-59cf1d65f7d69739a29a16fe678ebc4e1215e9c0.zip
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>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/mesh_plink.c3
1 files changed, 2 insertions, 1 deletions
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))