OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: allow iterating inactive interfaces 

Sometimes the driver might want to modify private data in interfaces
that are down. One possible use-case is cleaning up interface state
after HW recovery. Some interfaces that were up before the recovery took
place might be down now, but they might still be "dirty".

Introduce a new iterate_interfaces() API and a new ACTIVE iterator flag.
This way the internal implementation of the both active and inactive
APIs remains the same.

Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Arik Nemtsov 2015-03-01 09:10:15 +02:00 committed by Johannes Berg
parent 98fc43864a
commit 3384d757d4
2 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
include/net/mac80211.h
View File

@ -4346,12 +4346,32 @@ void ieee80211_sched_scan_stopped(struct ieee80211_hw *hw);
* haven't been re-added to the driver yet. * haven't been re-added to the driver yet.
* @IEEE80211_IFACE_ITER_RESUME_ALL: During resume, iterate over all * @IEEE80211_IFACE_ITER_RESUME_ALL: During resume, iterate over all
* interfaces, even if they haven't been re-added to the driver yet. * interfaces, even if they haven't been re-added to the driver yet.
* @IEEE80211_IFACE_ITER_ACTIVE: Iterate only active interfaces (netdev is up).
*/ */
enum ieee80211_interface_iteration_flags { enum ieee80211_interface_iteration_flags {
IEEE80211_IFACE_ITER_NORMAL = 0, IEEE80211_IFACE_ITER_NORMAL = 0,
IEEE80211_IFACE_ITER_RESUME_ALL = BIT(0), IEEE80211_IFACE_ITER_RESUME_ALL = BIT(0),
IEEE80211_IFACE_ITER_ACTIVE = BIT(1),
}; };
/**
* ieee80211_iterate_interfaces - iterate interfaces
*
* This function iterates over the interfaces associated with a given
* hardware and calls the callback for them. This includes active as well as
* inactive interfaces. This function allows the iterator function to sleep.
* Will iterate over a new interface during add_interface().
*
* @hw: the hardware struct of which the interfaces should be iterated over
* @iter_flags: iteration flags, see &enum ieee80211_interface_iteration_flags
* @iterator: the iterator function to call
* @data: first argument of the iterator function
*/
void ieee80211_iterate_interfaces(struct ieee80211_hw *hw, u32 iter_flags,
void (*iterator)(void *data, u8 *mac,
struct ieee80211_vif *vif),
void *data);
/** /**
* ieee80211_iterate_active_interfaces - iterate active interfaces * ieee80211_iterate_active_interfaces - iterate active interfaces
* *
@ -4367,11 +4387,16 @@ enum ieee80211_interface_iteration_flags {
* @iterator: the iterator function to call * @iterator: the iterator function to call
* @data: first argument of the iterator function * @data: first argument of the iterator function
*/ */
void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw, static inline void
u32 iter_flags, ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw, u32 iter_flags,
void (*iterator)(void *data, u8 *mac, void (*iterator)(void *data, u8 *mac,
struct ieee80211_vif *vif), struct ieee80211_vif *vif),
void *data); void *data)
{
ieee80211_iterate_interfaces(hw,
iter_flags | IEEE80211_IFACE_ITER_ACTIVE,
iterator, data);
}
/** /**
* ieee80211_iterate_active_interfaces_atomic - iterate active interfaces * ieee80211_iterate_active_interfaces_atomic - iterate active interfaces

29
net/mac80211/util.c
View File

@ -625,13 +625,14 @@ void ieee80211_wake_vif_queues(struct ieee80211_local *local,
reason, true); reason, true);
} }
static void __iterate_active_interfaces(struct ieee80211_local *local, static void __iterate_interfaces(struct ieee80211_local *local,
u32 iter_flags, u32 iter_flags,
void (*iterator)(void *data, u8 *mac, void (*iterator)(void *data, u8 *mac,
struct ieee80211_vif *vif), struct ieee80211_vif *vif),
void *data) void *data)
{ {
struct ieee80211_sub_if_data *sdata; struct ieee80211_sub_if_data *sdata;
bool active_only = iter_flags & IEEE80211_IFACE_ITER_ACTIVE;
list_for_each_entry_rcu(sdata, &local->interfaces, list) { list_for_each_entry_rcu(sdata, &local->interfaces, list) {
switch (sdata->vif.type) { switch (sdata->vif.type) {
@ -645,9 +646,9 @@ static void __iterate_active_interfaces(struct ieee80211_local *local,
break; break;
} }
if (!(iter_flags & IEEE80211_IFACE_ITER_RESUME_ALL) && if (!(iter_flags & IEEE80211_IFACE_ITER_RESUME_ALL) &&
!(sdata->flags & IEEE80211_SDATA_IN_DRIVER)) active_only && !(sdata->flags & IEEE80211_SDATA_IN_DRIVER))
continue; continue;
if (ieee80211_sdata_running(sdata)) if (ieee80211_sdata_running(sdata) || !active_only)
iterator(data, sdata->vif.addr, iterator(data, sdata->vif.addr,
&sdata->vif); &sdata->vif);
} }
@ -656,12 +657,12 @@ static void __iterate_active_interfaces(struct ieee80211_local *local,
lockdep_is_held(&local->iflist_mtx) || lockdep_is_held(&local->iflist_mtx) ||
lockdep_rtnl_is_held()); lockdep_rtnl_is_held());
if (sdata && if (sdata &&
(iter_flags & IEEE80211_IFACE_ITER_RESUME_ALL || (iter_flags & IEEE80211_IFACE_ITER_RESUME_ALL || !active_only ||
sdata->flags & IEEE80211_SDATA_IN_DRIVER)) sdata->flags & IEEE80211_SDATA_IN_DRIVER))
iterator(data, sdata->vif.addr, &sdata->vif); iterator(data, sdata->vif.addr, &sdata->vif);
} }
void ieee80211_iterate_active_interfaces( void ieee80211_iterate_interfaces(
struct ieee80211_hw *hw, u32 iter_flags, struct ieee80211_hw *hw, u32 iter_flags,
void (*iterator)(void *data, u8 *mac, void (*iterator)(void *data, u8 *mac,
struct ieee80211_vif *vif), struct ieee80211_vif *vif),
@ -670,10 +671,10 @@ void ieee80211_iterate_active_interfaces(
struct ieee80211_local *local = hw_to_local(hw); struct ieee80211_local *local = hw_to_local(hw);
mutex_lock(&local->iflist_mtx); mutex_lock(&local->iflist_mtx);
__iterate_active_interfaces(local, iter_flags, iterator, data); __iterate_interfaces(local, iter_flags, iterator, data);
mutex_unlock(&local->iflist_mtx); mutex_unlock(&local->iflist_mtx);
} }
EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces); EXPORT_SYMBOL_GPL(ieee80211_iterate_interfaces);
void ieee80211_iterate_active_interfaces_atomic( void ieee80211_iterate_active_interfaces_atomic(
struct ieee80211_hw *hw, u32 iter_flags, struct ieee80211_hw *hw, u32 iter_flags,
@ -684,7 +685,8 @@ void ieee80211_iterate_active_interfaces_atomic(
struct ieee80211_local *local = hw_to_local(hw); struct ieee80211_local *local = hw_to_local(hw);
rcu_read_lock(); rcu_read_lock();
__iterate_active_interfaces(local, iter_flags, iterator, data); __iterate_interfaces(local, iter_flags | IEEE80211_IFACE_ITER_ACTIVE,
iterator, data);
rcu_read_unlock(); rcu_read_unlock();
} }
EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_atomic); EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_atomic);
@ -699,7 +701,8 @@ void ieee80211_iterate_active_interfaces_rtnl(
ASSERT_RTNL(); ASSERT_RTNL();
__iterate_active_interfaces(local, iter_flags, iterator, data); __iterate_interfaces(local, iter_flags | IEEE80211_IFACE_ITER_ACTIVE,
iterator, data);
} }
EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_rtnl); EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_rtnl);