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

Commit 2f115cf2 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlwifi: remove unnecessary locking 



This code, and the places that set the variable
is_internal_short_scan and the vif pointers are
all protected by the mutex, there's no point in
locking the spinlock here as well (any more).

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent b23b025f

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+0 −3
Original line number Diff line number Diff line
@@ -1395,15 +1395,12 @@ int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) 
		u32 extra;

		u32 suspend_time = 100;

		u32 scan_suspend_time = 100;

		unsigned long flags;



		IWL_DEBUG_INFO(priv, "Scanning while associated...\n");

		spin_lock_irqsave(&priv->lock, flags);

		if (priv->is_internal_short_scan)

			interval = 0;

		else

			interval = vif->bss_conf.beacon_int;

		spin_unlock_irqrestore(&priv->lock, flags);



		scan->suspend_time = 0;

		scan->max_out_time = cpu_to_le32(200 * 1024);

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

+0 −3
Original line number Diff line number Diff line
@@ -2860,16 +2860,13 @@ int iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) 
		u32 extra;

		u32 suspend_time = 100;

		u32 scan_suspend_time = 100;

		unsigned long flags;



		IWL_DEBUG_INFO(priv, "Scanning while associated...\n");



		spin_lock_irqsave(&priv->lock, flags);

		if (priv->is_internal_short_scan)

			interval = 0;

		else

			interval = vif->bss_conf.beacon_int;

		spin_unlock_irqrestore(&priv->lock, flags);



		scan->suspend_time = 0;

		scan->max_out_time = cpu_to_le32(200 * 1024);