diff options
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac80211.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/scan.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index 79ad6958255c..bc5883a38f05 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c | |||
@@ -1951,10 +1951,10 @@ static int iwl_mvm_mac_hw_scan(struct ieee80211_hw *hw, | |||
1951 | 1951 | ||
1952 | iwl_mvm_ref(mvm, IWL_MVM_REF_SCAN); | 1952 | iwl_mvm_ref(mvm, IWL_MVM_REF_SCAN); |
1953 | 1953 | ||
1954 | if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN) | 1954 | if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN) |
1955 | ret = iwl_mvm_unified_scan_lmac(mvm, vif, hw_req); | ||
1956 | else if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN) | ||
1957 | ret = iwl_mvm_scan_umac(mvm, vif, hw_req); | 1955 | ret = iwl_mvm_scan_umac(mvm, vif, hw_req); |
1956 | else if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN) | ||
1957 | ret = iwl_mvm_unified_scan_lmac(mvm, vif, hw_req); | ||
1958 | else | 1958 | else |
1959 | ret = iwl_mvm_scan_request(mvm, vif, req); | 1959 | ret = iwl_mvm_scan_request(mvm, vif, req); |
1960 | 1960 | ||
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c index c440b7b3ea4f..219174597ff0 100644 --- a/drivers/net/wireless/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/iwlwifi/mvm/scan.c | |||
@@ -1025,17 +1025,17 @@ int iwl_mvm_scan_offload_start(struct iwl_mvm *mvm, | |||
1025 | { | 1025 | { |
1026 | int ret; | 1026 | int ret; |
1027 | 1027 | ||
1028 | if ((mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN)) { | 1028 | if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN) { |
1029 | mvm->scan_status = IWL_MVM_SCAN_SCHED; | ||
1030 | ret = iwl_mvm_config_sched_scan_profiles(mvm, req); | 1029 | ret = iwl_mvm_config_sched_scan_profiles(mvm, req); |
1031 | if (ret) | 1030 | if (ret) |
1032 | return ret; | 1031 | return ret; |
1033 | ret = iwl_mvm_unified_sched_scan_lmac(mvm, vif, req, ies); | 1032 | ret = iwl_mvm_sched_scan_umac(mvm, vif, req, ies); |
1034 | } else if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN) { | 1033 | } else if ((mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN)) { |
1034 | mvm->scan_status = IWL_MVM_SCAN_SCHED; | ||
1035 | ret = iwl_mvm_config_sched_scan_profiles(mvm, req); | 1035 | ret = iwl_mvm_config_sched_scan_profiles(mvm, req); |
1036 | if (ret) | 1036 | if (ret) |
1037 | return ret; | 1037 | return ret; |
1038 | ret = iwl_mvm_sched_scan_umac(mvm, vif, req, ies); | 1038 | ret = iwl_mvm_unified_sched_scan_lmac(mvm, vif, req, ies); |
1039 | } else { | 1039 | } else { |
1040 | mvm->scan_status = IWL_MVM_SCAN_SCHED; | 1040 | mvm->scan_status = IWL_MVM_SCAN_SCHED; |
1041 | ret = iwl_mvm_config_sched_scan(mvm, vif, req, ies); | 1041 | ret = iwl_mvm_config_sched_scan(mvm, vif, req, ies); |