[PATCH v2 7/8] mac80211: Don't take the mesh path resize lock when deleting an mpath
From: Javier Cardona <hidden>
Date: 2011-08-27 00:18:43
Subsystem:
mac80211, the rest · Maintainers:
Johannes Berg, Linus Torvalds
The mesh path resize lock is only needed to protect addition or removal of buckets on the hash table, not nodes on those buckets. Signed-off-by: Javier Cardona <redacted> --- net/mac80211/mesh_pathtbl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 3c03be9..216bd2f 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c@@ -905,8 +905,8 @@ int mesh_path_del(u8 *addr, struct ieee80211_sub_if_data *sdata) int hash_idx; int err = 0; - read_lock_bh(&pathtbl_resize_lock); - tbl = resize_dereference_mesh_paths(); + rcu_read_lock(); + tbl = rcu_dereference(mesh_paths); hash_idx = mesh_table_hash(addr, sdata, tbl); bucket = &tbl->hash_buckets[hash_idx];
@@ -924,7 +924,7 @@ int mesh_path_del(u8 *addr, struct ieee80211_sub_if_data *sdata) enddel: mesh_paths_generation++; spin_unlock_bh(&tbl->hashwlock[hash_idx]); - read_unlock_bh(&pathtbl_resize_lock); + rcu_read_unlock(); return err; }
--
1.7.6