diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-04-06 07:12:39 -0400 |
---|---|---|
committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-04-16 16:47:01 -0400 |
commit | 92ae80eec7ac642f249b7a2fc02f41441d128a62 (patch) | |
tree | be3a2a1fa54df6fa9b6ed95b862a1c746ade49fc /drivers/net/wireless/iwlwifi/iwl3945-base.c | |
parent | 6708dc863880777ffe5fc55c86bfd80f886f53d6 (diff) |
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/iwl3945-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index e26669558fc2..af32359400b3 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -3048,8 +3048,6 @@ static void iwl3945_bg_rx_replenish(struct work_struct *data) | |||
3048 | mutex_unlock(&priv->mutex); | 3048 | mutex_unlock(&priv->mutex); |
3049 | } | 3049 | } |
3050 | 3050 | ||
3051 | #define IWL_DELAY_NEXT_SCAN (HZ*2) | ||
3052 | |||
3053 | void iwl3945_post_associate(struct iwl_priv *priv) | 3051 | void iwl3945_post_associate(struct iwl_priv *priv) |
3054 | { | 3052 | { |
3055 | int rc = 0; | 3053 | int rc = 0; |
@@ -3134,9 +3132,6 @@ void iwl3945_post_associate(struct iwl_priv *priv) | |||
3134 | __func__, priv->iw_mode); | 3132 | __func__, priv->iw_mode); |
3135 | break; | 3133 | break; |
3136 | } | 3134 | } |
3137 | |||
3138 | /* we have just associated, don't start scan too early */ | ||
3139 | priv->next_scan_jiffies = jiffies + IWL_DELAY_NEXT_SCAN; | ||
3140 | } | 3135 | } |
3141 | 3136 | ||
3142 | /***************************************************************************** | 3137 | /***************************************************************************** |