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

Commit a6e492b9 authored by John W. Linville's avatar John W. Linville
Browse files

iwlwifi: assume vif is NULL for internal scans and non-NULL otherwise 



The current practice of checking vif for NULL in one place but not
another seems to confuse some static checkers, smatch in particular.
Since vif will only be NULL in the case of internal scans, adjust the
checks accordingly.

Reported-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6cb8755b

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

+4 −1
Original line number Diff line number Diff line
@@ -1234,7 +1234,10 @@ void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) 


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

		spin_lock_irqsave(&priv->lock, flags);

		interval = vif ? vif->bss_conf.beacon_int : 0;

		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;

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

+4 −1
Original line number Diff line number Diff line
@@ -2881,7 +2881,10 @@ void iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) 
		IWL_DEBUG_INFO(priv, "Scanning while associated...\n");



		spin_lock_irqsave(&priv->lock, flags);

		interval = vif ? vif->bss_conf.beacon_int : 0;

		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;