iwlwifi: remove support for fw older than -16.ucode

API version lower than 16 is not supported anymore - don't
load older ucode.
Remove code handling older versions.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sf.c b/drivers/net/wireless/intel/iwlwifi/mvm/sf.c
index c2def1232a8c..443a42855c9e 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sf.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sf.c
@@ -193,7 +193,7 @@ static void iwl_mvm_fill_sf_command(struct iwl_mvm *mvm,
                 }
         }
 
-        if (sta || IWL_UCODE_API(mvm->fw->ucode_ver) < 13) {
+        if (sta) {
                 BUILD_BUG_ON(sizeof(sf_full_timeout) !=
                              sizeof(__le32) * SF_NUM_SCENARIO *
                              SF_NUM_TIMEOUT_TYPES);
@@ -220,9 +220,6 @@ static int iwl_mvm_sf_config(struct iwl_mvm *mvm, u8 sta_id,
         struct ieee80211_sta *sta;
         int ret = 0;
 
-        if (IWL_UCODE_API(mvm->fw->ucode_ver) < 13)
-                sf_cmd.state = cpu_to_le32(new_state);
-
         if (mvm->cfg->disable_dummy_notification)
                 sf_cmd.state |= cpu_to_le32(SF_CFG_DUMMY_NOTIF_OFF);
 
@@ -235,8 +232,7 @@ static int iwl_mvm_sf_config(struct iwl_mvm *mvm, u8 sta_id,
 
         switch (new_state) {
         case SF_UNINIT:
-                if (IWL_UCODE_API(mvm->fw->ucode_ver) >= 13)
-                        iwl_mvm_fill_sf_command(mvm, &sf_cmd, NULL);
+                iwl_mvm_fill_sf_command(mvm, &sf_cmd, NULL);
                 break;
         case SF_FULL_ON:
                 if (sta_id == IWL_MVM_STATION_COUNT) {