diff options
| author | Thomas Pedersen <thomas@cozybit.com> | 2013-01-23 12:18:12 -0800 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-01-24 16:03:34 +0100 |
| commit | 296fcba3ba1b8888aa8f5211de1e25a78b47aeee (patch) | |
| tree | a8bb05498d62558513074cd6ded9975f2f2a5043 /net/mac80211/sta_info.c | |
| parent | d437c86baacf265a640dfc462c75941d02c0e153 (diff) | |
mac80211: clean up mesh sta allocation warning
This refactoring fixes a "scheduling while atomic" warning
when allocating a mesh station entry while holding the RCU
read lock. Fix this by creating a new function
mesh_sta_info_get(), which correctly handles the locking
and returns under RCU.
Also move some unnecessarily #ifdefed mesh station init
code from sta_info_alloc() to __mesh_sta_info_alloc().
Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
[change code flow to make sparse happy]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/sta_info.c')
| -rw-r--r-- | net/mac80211/sta_info.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 9d864ed5f3d..227233c3ff7 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -380,11 +380,6 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata, sta_dbg(sdata, "Allocated STA %pM\n", sta->sta.addr); -#ifdef CONFIG_MAC80211_MESH - sta->plink_state = NL80211_PLINK_LISTEN; - init_timer(&sta->plink_timer); -#endif - return sta; } |