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

Commit b975e55a authored by David Spinadel's avatar David Spinadel Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: go to umac scan even if lmac tlv bit is on 



LMAC TLV bit may be on in FWs that support UMAC scan; so check
for UMAC TLV bit first.

Signed-off-by: default avatarDavid Spinadel <david.spinadel@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent d6bda667

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+3 −3
Original line number Diff line number Diff line
@@ -1951,10 +1951,10 @@ static int iwl_mvm_mac_hw_scan(struct ieee80211_hw *hw, 


	iwl_mvm_ref(mvm, IWL_MVM_REF_SCAN);



	if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN)

		ret = iwl_mvm_unified_scan_lmac(mvm, vif, hw_req);

	else if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)

	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)

		ret = iwl_mvm_scan_umac(mvm, vif, hw_req);

	else if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN)

		ret = iwl_mvm_unified_scan_lmac(mvm, vif, hw_req);

	else

		ret = iwl_mvm_scan_request(mvm, vif, req);

drivers/net/wireless/iwlwifi/mvm/scan.c

+5 −5
Original line number Diff line number Diff line
@@ -1025,17 +1025,17 @@ int iwl_mvm_scan_offload_start(struct iwl_mvm *mvm, 
{

	int ret;



	if ((mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN)) {

		mvm->scan_status = IWL_MVM_SCAN_SCHED;

	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN) {

		ret = iwl_mvm_config_sched_scan_profiles(mvm, req);

		if (ret)

			return ret;

		ret = iwl_mvm_unified_sched_scan_lmac(mvm, vif, req, ies);

	} else if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN) {

		ret = iwl_mvm_sched_scan_umac(mvm, vif, req, ies);

	} else if ((mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN)) {

		mvm->scan_status = IWL_MVM_SCAN_SCHED;

		ret = iwl_mvm_config_sched_scan_profiles(mvm, req);

		if (ret)

			return ret;

		ret = iwl_mvm_sched_scan_umac(mvm, vif, req, ies);

		ret = iwl_mvm_unified_sched_scan_lmac(mvm, vif, req, ies);

	} else {

		mvm->scan_status = IWL_MVM_SCAN_SCHED;

		ret = iwl_mvm_config_sched_scan(mvm, vif, req, ies);