aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intel/iwlwifi/mvm/sf.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/sf.c')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/sf.c8
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,
193 } 193 }
194 } 194 }
195 195
196 if (sta || IWL_UCODE_API(mvm->fw->ucode_ver) < 13) { 196 if (sta) {
197 BUILD_BUG_ON(sizeof(sf_full_timeout) != 197 BUILD_BUG_ON(sizeof(sf_full_timeout) !=
198 sizeof(__le32) * SF_NUM_SCENARIO * 198 sizeof(__le32) * SF_NUM_SCENARIO *
199 SF_NUM_TIMEOUT_TYPES); 199 SF_NUM_TIMEOUT_TYPES);
@@ -220,9 +220,6 @@ static int iwl_mvm_sf_config(struct iwl_mvm *mvm, u8 sta_id,
220 struct ieee80211_sta *sta; 220 struct ieee80211_sta *sta;
221 int ret = 0; 221 int ret = 0;
222 222
223 if (IWL_UCODE_API(mvm->fw->ucode_ver) < 13)
224 sf_cmd.state = cpu_to_le32(new_state);
225
226 if (mvm->cfg->disable_dummy_notification) 223 if (mvm->cfg->disable_dummy_notification)
227 sf_cmd.state |= cpu_to_le32(SF_CFG_DUMMY_NOTIF_OFF); 224 sf_cmd.state |= cpu_to_le32(SF_CFG_DUMMY_NOTIF_OFF);
228 225
@@ -235,8 +232,7 @@ static int iwl_mvm_sf_config(struct iwl_mvm *mvm, u8 sta_id,
235 232
236 switch (new_state) { 233 switch (new_state) {
237 case SF_UNINIT: 234 case SF_UNINIT:
238 if (IWL_UCODE_API(mvm->fw->ucode_ver) >= 13) 235 iwl_mvm_fill_sf_command(mvm, &sf_cmd, NULL);
239 iwl_mvm_fill_sf_command(mvm, &sf_cmd, NULL);
240 break; 236 break;
241 case SF_FULL_ON: 237 case SF_FULL_ON:
242 if (sta_id == IWL_MVM_STATION_COUNT) { 238 if (sta_id == IWL_MVM_STATION_COUNT) {