From af1e9f1915eaeb045df3805519c6d130a4fe3517 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 28 Nov 2007 10:55:32 +0100
Subject: [PATCH] --- yaml --- r: 78246 b: refs/heads/master c:
 e38bad4766a110b61fa6038f10be16ced8c6cc38 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/net/mac80211.h | 3 +--
 trunk/net/mac80211/util.c    | 7 ++++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 2ef283b02744..5cded28bc979 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76ee65bfaa1435320a72989a6413467ce446ae23
+refs/heads/master: e38bad4766a110b61fa6038f10be16ced8c6cc38
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
index 1470e1b886f0..4cc5b1c8a4f1 100644
--- a/trunk/include/net/mac80211.h
+++ b/trunk/include/net/mac80211.h
@@ -1411,10 +1411,9 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw);
  *
  * This function iterates over the interfaces associated with a given
  * hardware that are currently active and calls the callback for them.
- * Must be called under RTNL.
  *
  * @hw: the hardware struct of which the interfaces should be iterated over
- * @iterator: the iterator function to call
+ * @iterator: the iterator function to call, cannot sleep
  * @data: first argument of the iterator function
  */
 void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw,
diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c
index 5227c16f113e..7b278e9aa1a4 100644
--- a/trunk/net/mac80211/util.c
+++ b/trunk/net/mac80211/util.c
@@ -482,10 +482,9 @@ void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw,
 	struct ieee80211_local *local = hw_to_local(hw);
 	struct ieee80211_sub_if_data *sdata;
 
-	ASSERT_RTNL();
+	rcu_read_lock();
 
-	/* we hold the RTNL here so can safely walk the list */
-	list_for_each_entry(sdata, &local->interfaces, list) {
+	list_for_each_entry_rcu(sdata, &local->interfaces, list) {
 		switch (sdata->type) {
 		case IEEE80211_IF_TYPE_INVALID:
 		case IEEE80211_IF_TYPE_MNTR:
@@ -503,5 +502,7 @@ void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw,
 			iterator(data, sdata->dev->dev_addr,
 				 sdata->dev->ifindex);
 	}
+
+	rcu_read_unlock();
 }
 EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces);