diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-21 23:47:33 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-21 23:47:33 +0100 |
| commit | 4b0d1a0b1fd7248d0fc341d00ed908c7373c7788 (patch) | |
| tree | 7ba1dad63482c9a3d4461ec324aef9f909e73f49 /net/mac80211/iface.c | |
| parent | Merge branch '20120221_isdn' of git://repo.or.cz/linux-2.6/trivial-mods (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-4b0d1a0b1fd7248d0fc341d00ed908c7373c7788.tar.xz linux-4b0d1a0b1fd7248d0fc341d00ed908c7373c7788.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 2efd595b2f7a..6b3cd65d1e07 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; } @@ -1330,7 +1332,8 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local) wk->sdata->vif.bss_conf.idle = false; } - if (local->scan_sdata) { + if (local->scan_sdata && + !(local->hw.flags & IEEE80211_HW_SCAN_WHILE_IDLE)) { scanning = true; local->scan_sdata->vif.bss_conf.idle = false; } |