dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2011-05-12 15:03:32 +02:00 committed by John W. Linville
parent be0e6aa5a0
commit dea4096bc4
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net/mac80211/mesh_hwmp.c
View File

@ -966,20 +966,11 @@ endlookup:
void mesh_path_timer(unsigned long data)
{
struct ieee80211_sub_if_data *sdata;
struct mesh_path *mpath;
struct mesh_path *mpath = (void *) data;
struct ieee80211_sub_if_data *sdata = mpath->sdata;
rcu_read_lock();
mpath = (struct mesh_path *) data;
mpath = rcu_dereference(mpath);
if (!mpath)
goto endmpathtimer;
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