2013-01-27 01:01:03

by Thomas Pedersen

Subject: [PATCH] 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 <[email protected]>
---
net/mac80211/mesh_plink.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index ca4f2d8..6787d69 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -468,6 +468,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;
}
--
1.7.10.4

2013-01-28 12:15:40

by Johannes Berg

Subject: Re: [PATCH] mac80211: fix mesh_sta_info_get() reshuffle damage

On Sat, 2013-01-26 at 17:00 -0800, Thomas Pedersen wrote:
> 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.

Ouch, sorry. Applied.

johannes