Messages in this thread Patch in this message | | | Date | Tue, 11 Nov 2008 16:23:52 -0800 | From | Greg KH <> | Subject | [patch 28/49] iwlwifi: allow consecutive scans in unassociated state |
| |
2.6.27-stable review patch. If anyone has any objections, please let us know.
------------------
From: Ron Rindjunsky <ron.rindjunsky@intel.com>
commit 681c0050ea3ac2e90c83d5af397d73eed848a372 upstream
This patch allows consecutive scans requests when driver is in unassociated state.
Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com> Signed-off-by: Esti Kummer <ester.kummer@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- drivers/net/wireless/iwlwifi/iwl-agn.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -3214,13 +3214,15 @@ static int iwl4965_mac_hw_scan(struct ie /* we don't schedule scan within next_scan_jiffies period */ if (priv->next_scan_jiffies && - time_after(priv->next_scan_jiffies, jiffies)) { + time_after(priv->next_scan_jiffies, jiffies)) { + IWL_DEBUG_SCAN("scan rejected: within next scan period\n"); rc = -EAGAIN; goto out_unlock; } /* if we just finished scan ask for delay */ - if (priv->last_scan_jiffies && time_after(priv->last_scan_jiffies + - IWL_DELAY_NEXT_SCAN, jiffies)) { + if (iwl_is_associated(priv) && priv->last_scan_jiffies && + time_after(priv->last_scan_jiffies + IWL_DELAY_NEXT_SCAN, jiffies)) { + IWL_DEBUG_SCAN("scan rejected: within previous scan period\n"); rc = -EAGAIN; goto out_unlock; } --
| |