1 files changed, 4 insertions, 23 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index 00b03fc5807b..f279fdd6eb44 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -739,22 +739,6 @@ iwl_mvm_build_scan_probe(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
         params->preq.common_data.len = cpu_to_le16(ies->common_ie_len);
 }
 
-static __le32 iwl_mvm_scan_priority(struct iwl_mvm *mvm,
-                                    enum iwl_scan_priority_ext prio)
-{
-        if (fw_has_api(&mvm->fw->ucode_capa,
-                       IWL_UCODE_TLV_API_EXT_SCAN_PRIORITY))
-                return cpu_to_le32(prio);
-
-        if (prio <= IWL_SCAN_PRIORITY_EXT_2)
-                return cpu_to_le32(IWL_SCAN_PRIORITY_LOW);
-
-        if (prio <= IWL_SCAN_PRIORITY_EXT_4)
-                return cpu_to_le32(IWL_SCAN_PRIORITY_MEDIUM);
-
-        return cpu_to_le32(IWL_SCAN_PRIORITY_HIGH);
-}
-
 static void iwl_mvm_scan_lmac_dwell(struct iwl_mvm *mvm,
                                     struct iwl_scan_req_lmac *cmd,
                                     struct iwl_mvm_scan_params *params)
@@ -765,7 +749,7 @@ static void iwl_mvm_scan_lmac_dwell(struct iwl_mvm *mvm,
         cmd->extended_dwell = scan_timing[params->type].dwell_extended;
         cmd->max_out_time = cpu_to_le32(scan_timing[params->type].max_out_time);
         cmd->suspend_time = cpu_to_le32(scan_timing[params->type].suspend_time);
-        cmd->scan_prio = iwl_mvm_scan_priority(mvm, IWL_SCAN_PRIORITY_EXT_6);
+        cmd->scan_prio = cpu_to_le32(IWL_SCAN_PRIORITY_EXT_6);
 }
 
 static inline bool iwl_mvm_scan_fits(struct iwl_mvm *mvm, int n_ssids,
@@ -1067,15 +1051,12 @@ static void iwl_mvm_scan_umac_dwell(struct iwl_mvm *mvm,
         cmd->fragmented_dwell = scan_timing[params->type].dwell_fragmented;
         cmd->max_out_time = cpu_to_le32(scan_timing[params->type].max_out_time);
         cmd->suspend_time = cpu_to_le32(scan_timing[params->type].suspend_time);
-        cmd->scan_priority =
-                iwl_mvm_scan_priority(mvm, IWL_SCAN_PRIORITY_EXT_6);
+        cmd->scan_priority = cpu_to_le32(IWL_SCAN_PRIORITY_EXT_6);
 
         if (iwl_mvm_is_regular_scan(params))
-                cmd->ooc_priority =
-                        iwl_mvm_scan_priority(mvm, IWL_SCAN_PRIORITY_EXT_6);
+                cmd->ooc_priority = cpu_to_le32(IWL_SCAN_PRIORITY_EXT_6);
         else
-                cmd->ooc_priority =
-                        iwl_mvm_scan_priority(mvm, IWL_SCAN_PRIORITY_EXT_2);
+                cmd->ooc_priority = cpu_to_le32(IWL_SCAN_PRIORITY_EXT_2);
 }
 
 static void