summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorThomas Pedersen <thomas@cozybit.com>2013-01-26 17:00:02 -0800
committerJohannes Berg <johannes.berg@intel.com>2013-01-28 13:15:34 +0100
commit3b4797bce0050570e84bedd10e1b14e9320a3551 (patch)
tree2ef341cd663a3d781cd8200b76d13d2fc7213cac /net
parent77765eaf5cfb6b8dd98ec8b54b411d74ff6095f1 (diff)
downloadop-kernel-dev-3b4797bce0050570e84bedd10e1b14e9320a3551.zip
op-kernel-dev-3b4797bce0050570e84bedd10e1b14e9320a3551.tar.gz
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 <thomas@cozybit.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/mesh_plink.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index 4e1d406..81e6126 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;
}
OpenPOWER on IntegriCloud