Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92ae80ee authored by Johannes Berg's avatar Johannes Berg Committed by Reinette Chatre
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent 6708dc86

drivers/net/wireless/iwlwifi/iwl-core.c

+0 −9
Original line number Diff line number Diff line
@@ -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

drivers/net/wireless/iwlwifi/iwl-dev.h

+0 −1
Original line number Diff line number Diff line
@@ -1049,7 +1049,6 @@ struct iwl_priv { 
	struct iwl_calib_result calib_results[IWL_CALIB_MAX];



	/* Scan related variables */

	unsigned long next_scan_jiffies;

	unsigned long scan_start;

	unsigned long scan_pass_start;

	unsigned long scan_start_tsf;

drivers/net/wireless/iwlwifi/iwl-scan.c

+0 −20
Original line number Diff line number Diff line
@@ -199,9 +199,6 @@ static void iwl_rx_scan_results_notif(struct iwl_priv *priv, 
		       le32_to_cpu(notif->statistics[0]),

		       le32_to_cpu(notif->tsf_low) - priv->scan_start_tsf);

#endif



	if (!priv->is_internal_short_scan)

		priv->next_scan_jiffies = 0;

}



/* Service SCAN_COMPLETE_NOTIFICATION (0x84) */
@@ -234,9 +231,6 @@ static void iwl_rx_scan_complete_notif(struct iwl_priv *priv, 
	if (test_and_clear_bit(STATUS_SCAN_ABORTING, &priv->status))

		IWL_DEBUG_INFO(priv, "Aborted scan completed.\n");



	if (!priv->is_internal_short_scan)

		priv->next_scan_jiffies = 0;



	IWL_DEBUG_INFO(priv, "Setting scan to off\n");



	clear_bit(STATUS_SCANNING, &priv->status);
@@ -462,8 +456,6 @@ static int iwl_scan_initiate(struct iwl_priv *priv) 
	return 0;

}



#define IWL_DELAY_NEXT_SCAN (HZ*2)



int iwl_mac_hw_scan(struct ieee80211_hw *hw,

		     struct cfg80211_scan_request *req)

{
@@ -497,18 +489,6 @@ int iwl_mac_hw_scan(struct ieee80211_hw *hw, 
		goto out_unlock;

	}



	/* We don't schedule scan within next_scan_jiffies period.

	 * Avoid scanning during possible EAPOL exchange, return

	 * success immediately.

	 */

	if (priv->next_scan_jiffies &&

	    time_after(priv->next_scan_jiffies, jiffies)) {

		IWL_DEBUG_SCAN(priv, "scan rejected: within next scan period\n");

		queue_work(priv->workqueue, &priv->scan_completed);

		ret = 0;

		goto out_unlock;

	}



	/* mac80211 will only ask for one band at a time */

	priv->scan_band = req->channels[0]->band;

	priv->scan_request = req;

drivers/net/wireless/iwlwifi/iwl3945-base.c

+0 −5
Original line number Diff line number Diff line
@@ -3048,8 +3048,6 @@ static void iwl3945_bg_rx_replenish(struct work_struct *data) 
	mutex_unlock(&priv->mutex);

}



#define IWL_DELAY_NEXT_SCAN (HZ*2)



void iwl3945_post_associate(struct iwl_priv *priv)

{

	int rc = 0;
@@ -3134,9 +3132,6 @@ void iwl3945_post_associate(struct iwl_priv *priv) 
			   __func__, priv->iw_mode);

		break;

	}



	/* we have just associated, don't start scan too early */

	priv->next_scan_jiffies = jiffies + IWL_DELAY_NEXT_SCAN;

}



/*****************************************************************************