linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Pedersen <thomas@cozybit.com>
To: linux-wireless@vger.kernel.org
Cc: Javier Cardona <javier@cozybit.com>,
	johannes@sipsolutions.net, linville@tuxdriver.com
Subject: [PATCH 8/9] mac80211: Don't take the mesh path resize lock when deleting an mpath
Date: Wed, 24 Aug 2011 18:40:51 -0700	[thread overview]
Message-ID: <1314236452-7226-9-git-send-email-thomas@cozybit.com> (raw)
In-Reply-To: <1314236452-7226-1-git-send-email-thomas@cozybit.com>

From: Javier Cardona <javier@cozybit.com>

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 <javier@cozybit.com>
---
 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 9d9e1ac..4bfbe31 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.4.1


  parent reply	other threads:[~2011-08-25  1:41 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-25  1:40 [PATCH 0/9] mesh fixes Thomas Pedersen
2011-08-25  1:40 ` [PATCH 1/9] mac80211: Fix RCU pointer dereference in mesh_path_discard_frame() Thomas Pedersen
2011-08-25  2:08   ` Johannes Berg
2011-08-25 18:16     ` Javier Cardona
2011-08-25 18:21       ` Johannes Berg
2011-08-25 18:45         ` Javier Cardona
2011-08-25 18:48           ` Johannes Berg
2011-08-25 19:04             ` Javier Cardona
2011-08-25  1:40 ` [PATCH 2/9] mac80211: Limit amount of HWMP frames and forwarded data packets in queues on mesh interfaces Thomas Pedersen
2011-08-25  5:08   ` Johannes Berg
2011-08-25 17:46     ` Javier Cardona
2011-08-25  1:40 ` [PATCH 3/9] mac80211: Remove mesh paths when an interface is removed Thomas Pedersen
2011-08-25  1:40 ` [PATCH 4/9] mac80211: Improve mpath state locking Thomas Pedersen
2011-08-25  1:40 ` [PATCH 5/9] mac80211: Remove redundant mesh path expiration checks Thomas Pedersen
2011-08-25  1:40 ` [PATCH 6/9] mac80211: Don't iterate twice over all mpaths when once in sufficient Thomas Pedersen
2011-08-25  1:40 ` [PATCH 7/9] mac80211: Consolidate {mesh,mpp}_path_flush into one function Thomas Pedersen
2011-08-25  1:40 ` Thomas Pedersen [this message]
2011-08-25  1:40 ` [PATCH 9/9] mac80211: Consolidate mesh path duplicated functions Thomas Pedersen
2011-08-27  0:18 ` [PATCH v2 0/8] mesh fixes Javier Cardona
2011-08-27  0:18   ` [PATCH v2 1/8] mac80211: Fix RCU pointer dereference in mesh_path_discard_frame() Javier Cardona
2011-08-27  0:18   ` [PATCH v2 2/8] mac80211: Remove mesh paths when an interface is removed Javier Cardona
2011-08-27  0:18   ` [PATCH v2 3/8] mac80211: Improve mpath state locking Javier Cardona
2011-08-27  0:18   ` [PATCH v2 4/8] mac80211: Remove redundant mesh path expiration checks Javier Cardona
2011-08-27  0:18   ` [PATCH v2 5/8] mac80211: Don't iterate twice over all mpaths when once in sufficient Javier Cardona
2011-08-27  0:18   ` [PATCH v2 6/8] mac80211: Consolidate {mesh,mpp}_path_flush into one function Javier Cardona
2011-08-29 13:49     ` Johannes Berg
2011-08-29 18:36       ` Javier Cardona
2011-08-29 18:38         ` Johannes Berg
2011-08-27  0:18   ` [PATCH v2 7/8] mac80211: Don't take the mesh path resize lock when deleting an mpath Javier Cardona
2011-08-29 13:49     ` Johannes Berg
2011-08-27  0:18   ` [PATCH v2 8/8] mac80211: Consolidate mesh path duplicated functions Javier Cardona

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1314236452-7226-9-git-send-email-thomas@cozybit.com \
    --to=thomas@cozybit.com \
    --cc=javier@cozybit.com \
    --cc=johannes@sipsolutions.net \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).