diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-01-20 13:55:27 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-06 14:50:37 -0500 |
| commit | 66e67e418908442389d3a9e6509985f01cbaf9b0 (patch) | |
| tree | 01fad87d0d47f5887497c569d98cee20fa1f0f29 /net/mac80211/iface.c | |
| parent | 4c0c0b75e0c35ddb8f61c06bcbffede63ab4f4a2 (diff) | |
mac80211: redesign auth/assoc
This is the second part of the auth/assoc redesign,
the mac80211 part. This moves the auth/assoc code
out of the work abstraction and into the MLME, so
that we don't flip channels all the time etc.
The only downside is that when we are associated,
we need to drop the association in order to create
a connection to another AP, but for most drivers
this is actually desirable and the ability to do
was never used by any applications. If we want to
implement resource reservation with FT-OTA, we'd
probably best do it with explicit R-O-C in wpa_s.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 2efd595b2f7a..19f0818eba78 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1310,7 +1310,9 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local) /* do not count disabled managed interfaces */ if (sdata->vif.type == NL80211_IFTYPE_STATION && - !sdata->u.mgd.associated) { + !sdata->u.mgd.associated && + !sdata->u.mgd.auth_data && + !sdata->u.mgd.assoc_data) { sdata->vif.bss_conf.idle = true; continue; } |