From: Thomas Pedersen Date: Sun, 27 Jan 2013 01:00:02 +0000 (-0800) Subject: mac80211: fix mesh_sta_info_get() reshuffle damage X-Git-Tag: v3.9-rc1~139^2~2^2^2~42^2~48^2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3b4797bce0050570e84bedd10e1b14e9320a3551;p=~emulex%2Finfiniband.git mac80211: fix mesh_sta_info_get() reshuffle damage Before "mac80211: clean up mesh sta allocation warning" was applied, mesh_sta_info_get() was reshuffled to please sparse. As a result we neglect to initialize newly created STAs. Fix this. Signed-off-by: Thomas Pedersen Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index 4e1d406fd9b..81e612682bc 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c @@ -408,6 +408,8 @@ mesh_sta_info_get(struct ieee80211_sub_if_data *sdata, return NULL; } + mesh_sta_info_init(sdata, sta, elems, true); + if (sta_info_insert_rcu(sta)) return NULL; }