Skip to content
Snippets Groups Projects
Commit dea4096b authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: remove pointless mesh path timer RCU code


The code here to RCU-dereference a pointer that's
on the stack is totally pointless, RCU isn't magic
(like say Java's weak references are), so the code
can't work like whoever wrote it thought it might.

Remove it so readers don't get confused. Note that
it seems that a bug is there anyway: I don't see
any code that cancels the timer when a mesh path
struct is destroyed.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent be0e6aa5
No related branches found
No related tags found
No related merge requests found
......@@ -966,20 +966,11 @@ int mesh_nexthop_lookup(struct sk_buff *skb,
void mesh_path_timer(unsigned long data)
{
struct ieee80211_sub_if_data *sdata;
struct mesh_path *mpath;
rcu_read_lock();
mpath = (struct mesh_path *) data;
mpath = rcu_dereference(mpath);
if (!mpath)
goto endmpathtimer;
sdata = mpath->sdata;
struct mesh_path *mpath = (void *) data;
struct ieee80211_sub_if_data *sdata = mpath->sdata;
if (sdata->local->quiescing) {
rcu_read_unlock();
if (sdata->local->quiescing)
return;
}
spin_lock_bh(&mpath->state_lock);
if (mpath->flags & MESH_PATH_RESOLVED ||
......@@ -996,8 +987,6 @@ void mesh_path_timer(unsigned long data)
}
spin_unlock_bh(&mpath->state_lock);
endmpathtimer:
rcu_read_unlock();
}
void
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment