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

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

iwlwifi: remove dead code from iwl_mac_reset_tsf 



iwl_mac_reset_tsf will only ever be called in
IBSS mode, so checking for other modes is not
useful and the code that depends on that will
not be executed.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent d6bde7d9

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

+3 −13
Original line number Diff line number Diff line
@@ -2597,8 +2597,6 @@ void iwl_mac_reset_tsf(struct ieee80211_hw *hw) 


	priv->beacon_int = priv->vif->bss_conf.beacon_int;

	priv->timestamp = 0;

	if ((priv->iw_mode == NL80211_IFTYPE_STATION))

		priv->beacon_int = 0;



	spin_unlock_irqrestore(&priv->lock, flags);
@@ -2611,17 +2609,9 @@ void iwl_mac_reset_tsf(struct ieee80211_hw *hw) 
	/* we are restarting association process

	 * clear RXON_FILTER_ASSOC_MSK bit

	 */

	if (priv->iw_mode != NL80211_IFTYPE_AP) {

	iwl_scan_cancel_timeout(priv, 100);

	priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;

	iwlcore_commit_rxon(priv);

	}



	if (priv->iw_mode != NL80211_IFTYPE_ADHOC) {

		IWL_DEBUG_MAC80211(priv, "leave - not in IBSS\n");

		mutex_unlock(&priv->mutex);

		return;

	}



	iwl_set_rate(priv);