diff options
author | Eliad Peller <eliad@wizery.com> | 2012-03-04 03:55:46 -0500 |
---|---|---|
committer | Luciano Coelho <coelho@ti.com> | 2012-03-05 08:45:24 -0500 |
commit | 8a6a84a471f7de1845174d1dd66b35074d9d9398 (patch) | |
tree | 24bbc39f28dc3c358ae5d6e3984116635463a142 /drivers/net/wireless/wl12xx | |
parent | 349345a4ec631cd98767b58b065535dd2278697c (diff) |
wl12xx: consider bss_conf->idle instead of hw->conf.flags
On disassociation, check only whether the current vif
is idle, instead of checking whether the device is idle.
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx')
-rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 93636ea84dae..b771106c0a1e 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c | |||
@@ -3901,7 +3901,6 @@ sta_not_found: | |||
3901 | 3901 | ||
3902 | /* restore the bssid filter and go to dummy bssid */ | 3902 | /* restore the bssid filter and go to dummy bssid */ |
3903 | if (was_assoc) { | 3903 | if (was_assoc) { |
3904 | u32 conf_flags = wl->hw->conf.flags; | ||
3905 | /* | 3904 | /* |
3906 | * we might have to disable roc, if there was | 3905 | * we might have to disable roc, if there was |
3907 | * no IF_OPER_UP notification. | 3906 | * no IF_OPER_UP notification. |
@@ -3924,7 +3923,7 @@ sta_not_found: | |||
3924 | } | 3923 | } |
3925 | 3924 | ||
3926 | wl1271_unjoin(wl, wlvif); | 3925 | wl1271_unjoin(wl, wlvif); |
3927 | if (!(conf_flags & IEEE80211_CONF_IDLE)) | 3926 | if (!bss_conf->idle) |
3928 | wl12xx_start_dev(wl, wlvif); | 3927 | wl12xx_start_dev(wl, wlvif); |
3929 | } | 3928 | } |
3930 | } | 3929 | } |