diff options
author | Paul E. McKenney <paul.mckenney@linaro.org> | 2012-01-06 20:10:37 -0500 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-02-21 12:03:33 -0500 |
commit | ae1f18e480c83d15539fb234a2dc5f0aa04cb119 (patch) | |
tree | 7caaf3d0cbc08b455fa3851f305a0187b4a617da /net/mac80211 | |
parent | 605b4afec8e51d0603089eac01a3ca9dd919e909 (diff) |
mac80211: Convert call_rcu() to kfree_rcu(), drop mesh_gate_node_reclaim()
The call_rcu() in mesh_gate_del() invokes mesh_gate_node_reclaim(),
which simply calls kfree(). So convert the call_rcu() to kfree_rcu(),
allowing mesh_gate_node_reclaim() to be eliminated.
Signed-off-by: Paul E. McKenney <paul.mckenney@linaro.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: "John W. Linville" <linville@tuxdriver.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/mesh_pathtbl.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c index edf167e3b8f..30420bc1f69 100644 --- a/net/mac80211/mesh_pathtbl.c +++ b/net/mac80211/mesh_pathtbl.c | |||
@@ -413,12 +413,6 @@ struct mesh_path *mesh_path_lookup_by_idx(int idx, struct ieee80211_sub_if_data | |||
413 | return NULL; | 413 | return NULL; |
414 | } | 414 | } |
415 | 415 | ||
416 | static void mesh_gate_node_reclaim(struct rcu_head *rp) | ||
417 | { | ||
418 | struct mpath_node *node = container_of(rp, struct mpath_node, rcu); | ||
419 | kfree(node); | ||
420 | } | ||
421 | |||
422 | /** | 416 | /** |
423 | * mesh_path_add_gate - add the given mpath to a mesh gate to our path table | 417 | * mesh_path_add_gate - add the given mpath to a mesh gate to our path table |
424 | * @mpath: gate path to add to table | 418 | * @mpath: gate path to add to table |
@@ -479,7 +473,7 @@ static int mesh_gate_del(struct mesh_table *tbl, struct mesh_path *mpath) | |||
479 | if (gate->mpath == mpath) { | 473 | if (gate->mpath == mpath) { |
480 | spin_lock_bh(&tbl->gates_lock); | 474 | spin_lock_bh(&tbl->gates_lock); |
481 | hlist_del_rcu(&gate->list); | 475 | hlist_del_rcu(&gate->list); |
482 | call_rcu(&gate->rcu, mesh_gate_node_reclaim); | 476 | kfree_rcu(gate, rcu); |
483 | spin_unlock_bh(&tbl->gates_lock); | 477 | spin_unlock_bh(&tbl->gates_lock); |
484 | mpath->sdata->u.mesh.num_gates--; | 478 | mpath->sdata->u.mesh.num_gates--; |
485 | mpath->is_gate = false; | 479 | mpath->is_gate = false; |