summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2012-03-04 10:55:46 +0200
committerLuciano Coelho <coelho@ti.com>2012-03-05 15:45:24 +0200
commit8a6a84a471f7de1845174d1dd66b35074d9d9398 (patch)
tree24bbc39f28dc3c358ae5d6e3984116635463a142
parent349345a4ec631cd98767b58b065535dd2278697c (diff)
downloadlinux-8a6a84a471f7de1845174d1dd66b35074d9d9398.tar.gz
linux-8a6a84a471f7de1845174d1dd66b35074d9d9398.tar.bz2
linux-8a6a84a471f7de1845174d1dd66b35074d9d9398.zip
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>
-rw-r--r--drivers/net/wireless/wl12xx/main.c3
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:
/* restore the bssid filter and go to dummy bssid */
if (was_assoc) {
- u32 conf_flags = wl->hw->conf.flags;
/*
* we might have to disable roc, if there was
* no IF_OPER_UP notification.
@@ -3924,7 +3923,7 @@ sta_not_found:
}
wl1271_unjoin(wl, wlvif);
- if (!(conf_flags & IEEE80211_CONF_IDLE))
+ if (!bss_conf->idle)
wl12xx_start_dev(wl, wlvif);
}
}