Commit e38bad47 authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller

mac80211: make ieee80211_iterate_active_interfaces not need rtnl

Interface iteration in mac80211 can be done without holding any
locks because I converted it to RCU. Initially, I thought this
wouldn't be needed for ieee80211_iterate_active_interfaces but
it's turning out that multi-BSS AP support can be much simpler
in a driver if ieee80211_iterate_active_interfaces can be called
without holding locks. This converts it to use RCU, it adds a
requirement that the callback it invokes cannot sleep.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 76ee65bf
...@@ -1411,10 +1411,9 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw); ...@@ -1411,10 +1411,9 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw);
* *
* This function iterates over the interfaces associated with a given * This function iterates over the interfaces associated with a given
* hardware that are currently active and calls the callback for them. * 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 * @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 * @data: first argument of the iterator function
*/ */
void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw, void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw,
......
...@@ -482,10 +482,9 @@ void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw, ...@@ -482,10 +482,9 @@ void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw,
struct ieee80211_local *local = hw_to_local(hw); struct ieee80211_local *local = hw_to_local(hw);
struct ieee80211_sub_if_data *sdata; 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_rcu(sdata, &local->interfaces, list) {
list_for_each_entry(sdata, &local->interfaces, list) {
switch (sdata->type) { switch (sdata->type) {
case IEEE80211_IF_TYPE_INVALID: case IEEE80211_IF_TYPE_INVALID:
case IEEE80211_IF_TYPE_MNTR: case IEEE80211_IF_TYPE_MNTR:
...@@ -503,5 +502,7 @@ void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw, ...@@ -503,5 +502,7 @@ void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw,
iterator(data, sdata->dev->dev_addr, iterator(data, sdata->dev->dev_addr,
sdata->dev->ifindex); sdata->dev->ifindex);
} }
rcu_read_unlock();
} }
EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces); EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment