diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2008-09-16 08:01:03 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-09-24 22:17:59 +0200 |
| commit | 9ccacb86b5c613b25f41ca4227c3fb17bcd77de0 (patch) | |
| tree | 79fb8c2f5c0ceca9c867e1dab79861062f1c9e3c /drivers | |
| parent | b43: Issue warning when RFKILL_INPUT is not enabled (diff) | |
| download | linux-9ccacb86b5c613b25f41ca4227c3fb17bcd77de0.tar.xz linux-9ccacb86b5c613b25f41ca4227c3fb17bcd77de0.zip | |
iwlwifi: don't delay scan in IBSS mode
Scan need to be delayed only after association to allow EAPOL
exchange. We don't need the delay for IBSS mode.
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 273762769767..970d0b322659 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -2568,8 +2568,6 @@ static void iwl4965_post_associate(struct iwl_priv *priv) iwl_chain_noise_reset(priv); priv->start_calib = 1; - /* we have just associated, don't start scan too early */ - priv->next_scan_jiffies = jiffies + IWL_DELAY_NEXT_SCAN; } static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf); @@ -3171,6 +3169,10 @@ static void iwl4965_bss_info_changed(struct ieee80211_hw *hw, priv->power_data.dtim_period = bss_conf->dtim_period; priv->timestamp = bss_conf->timestamp; priv->assoc_capability = bss_conf->assoc_capability; + + /* we have just associated, don't start scan too early + * leave time for EAPOL exchange to complete + */ priv->next_scan_jiffies = jiffies + IWL_DELAY_NEXT_SCAN_AFTER_ASSOC; mutex_lock(&priv->mutex); |