diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-04-06 04:12:39 -0700 |
|---|---|---|
| committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-04-16 13:47:01 -0700 |
| commit | 92ae80eec7ac642f249b7a2fc02f41441d128a62 (patch) | |
| tree | be3a2a1fa54df6fa9b6ed95b862a1c746ade49fc /drivers/net/wireless/iwlwifi/iwl-core.c | |
| parent | 6708dc863880777ffe5fc55c86bfd80f886f53d6 (diff) | |
| download | kernel_samsung_smdk4412-92ae80eec7ac642f249b7a2fc02f41441d128a62.zip kernel_samsung_smdk4412-92ae80eec7ac642f249b7a2fc02f41441d128a62.tar.gz kernel_samsung_smdk4412-92ae80eec7ac642f249b7a2fc02f41441d128a62.tar.bz2 | |
iwlwifi: remove next_scan_jiffies
This logic is just confusing, if anything it
belongs into mac80211. Also, even if we do
scan during the EAPOL handshake, that will
not cause any problems, just a short delay.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 73f5fc6..9d300b2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c @@ -1867,7 +1867,6 @@ static inline void iwl_set_no_assoc(struct iwl_priv *priv) iwlcore_commit_rxon(priv); } -#define IWL_DELAY_NEXT_SCAN_AFTER_ASSOC (HZ*6) void iwl_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_bss_conf *bss_conf, @@ -1988,14 +1987,6 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw, iwl_led_associate(priv); - /* - * We have just associated, don't start scan too early - * leave time for EAPOL exchange to complete. - * - * XXX: do this in mac80211 - */ - priv->next_scan_jiffies = jiffies + - IWL_DELAY_NEXT_SCAN_AFTER_ASSOC; if (!iwl_is_rfkill(priv)) priv->cfg->ops->lib->post_associate(priv); } else |