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

Commit 8c9f514b authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

iwlwifi: remove unneeded disable_hw_scan check 



We never set STATUS_SCANNING in softwre scanning mode, disable_hw_scan
check is unneeded. Correct debug message while at it.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Acked-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 88e58fc5

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

+2 −3
Original line number Diff line number Diff line
@@ -85,10 +85,9 @@ int iwl_legacy_mac_config(struct ieee80211_hw *hw, u32 changed) 
	IWL_DEBUG_MAC80211(priv, "enter to channel %d changed 0x%X\n",

					channel->hw_value, changed);



	if (unlikely(!priv->cfg->mod_params->disable_hw_scan &&

			test_bit(STATUS_SCANNING, &priv->status))) {

	if (unlikely(test_bit(STATUS_SCANNING, &priv->status))) {

		scan_active = 1;

		IWL_DEBUG_MAC80211(priv, "leave - scanning\n");

		IWL_DEBUG_MAC80211(priv, "scan active\n");

	}



	if (changed & (IEEE80211_CONF_CHANGE_SMPS |