From 8a44d001d4f06248021f059faf4ae08d74a02ef6 Mon Sep 17 00:00:00 2001 From: Ron Rindjunsky Date: Wed, 3 Sep 2008 11:26:25 +0800 Subject: [PATCH] --- yaml --- r: 111423 b: refs/heads/master c: 681c0050ea3ac2e90c83d5af397d73eed848a372 h: refs/heads/master i: 111421: 68f313f59507fb639179698fa308fa526a9711f8 111419: 824447769dfec7c6b9c99f3e0298903b91730396 111415: 36df81d52c94c52dbdac1ab378e33d3a398429d4 111407: 87b9dd28311c0da9f99e62f619e2104a718f7c5f 111391: 12d4f154e9553d8c0a592499de599bae2e110a72 111359: c638e74166a08c5ee6a02bd13755e10fb051247d v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0f7da64d9f59..d3c344ef492d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c0399d3fde0a9958fb8e9a067a463643cf235b5 +refs/heads/master: 681c0050ea3ac2e90c83d5af397d73eed848a372 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c index 575c1d978288..7b8af9609e08 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -3205,12 +3205,14 @@ static int iwl_mac_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t ssid_len) /* we don't schedule scan within next_scan_jiffies period */ if (priv->next_scan_jiffies && time_after(priv->next_scan_jiffies, jiffies)) { + IWL_DEBUG_SCAN("scan rejected: within next scan period\n"); ret = -EAGAIN; goto out_unlock; } /* if we just finished scan ask for delay */ - if (priv->last_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"); ret = -EAGAIN; goto out_unlock; }