diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2009-12-23 13:15:35 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-28 16:54:55 -0500 |
| commit | af6b63741cc4e4dfd575d06beb333b11a8a6e0c0 (patch) | |
| tree | a2c1a27b6b6b0fb171606f3653b5c280537b32a3 /net/mac80211/iface.c | |
| parent | f679f65d417c3ea3f91b4bbfb68e3951c9eb8f04 (diff) | |
| download | kernel_samsung_smdk4412-af6b63741cc4e4dfd575d06beb333b11a8a6e0c0.zip kernel_samsung_smdk4412-af6b63741cc4e4dfd575d06beb333b11a8a6e0c0.tar.gz kernel_samsung_smdk4412-af6b63741cc4e4dfd575d06beb333b11a8a6e0c0.tar.bz2 | |
mac80211: generalise work handling
In order to use auth/assoc for different purposes
other than MLME, it needs to be split up. For other
purposes, a generic work handling (potentially on
another channel) will be useful.
To achieve that, this patch moves much of the MLME
work handling out of mlme into a new work API. The
API can currently handle probing a specific AP,
authentication and association. The MLME previously
handled probe/authentication as one step and will
continue to do so, but they are separate in the new
work handling.
Work items are RCU-managed to be able to check for
existence of an item for a specific frame in the RX
path, but they can be re-used which the MLME right
now will do for its combined probe/auth step.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 389dc8d..7d410f1 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -362,6 +362,11 @@ static int ieee80211_stop(struct net_device *dev) netif_stop_queue(dev); /* + * Purge work for this interface. + */ + ieee80211_work_purge(sdata); + + /* * Now delete all active aggregation sessions. */ rcu_read_lock(); @@ -928,6 +933,9 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local) struct ieee80211_sub_if_data *sdata; int count = 0; + if (!list_empty(&local->work_list)) + return ieee80211_idle_off(local, "working"); + if (local->scanning) return ieee80211_idle_off(local, "scanning"); @@ -936,8 +944,7 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local) continue; /* do not count disabled managed interfaces */ if (sdata->vif.type == NL80211_IFTYPE_STATION && - !sdata->u.mgd.associated && - list_empty(&sdata->u.mgd.work_list)) + !sdata->u.mgd.associated) continue; /* do not count unused IBSS interfaces */ if (sdata->vif.type == NL80211_IFTYPE_ADHOC && |