Commit 398760aa authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho

iwlwifi: mvm: d3: remove fixed cmd_flags argument

We only ever pass cmd_flags == CMD_ASYNC, so might as well
not have the argument. Remove it.
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210805130823.9130db608b77.I352cbc35fefd98cc00aa0c69ea43863942aa62f5@changeidSigned-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 0419e5e6
...@@ -745,8 +745,7 @@ iwl_mvm_get_wowlan_config(struct iwl_mvm *mvm, ...@@ -745,8 +745,7 @@ iwl_mvm_get_wowlan_config(struct iwl_mvm *mvm,
} }
static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm, static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm,
struct ieee80211_vif *vif, struct ieee80211_vif *vif)
u32 cmd_flags)
{ {
struct iwl_wowlan_kek_kck_material_cmd_v4 kek_kck_cmd = {}; struct iwl_wowlan_kek_kck_material_cmd_v4 kek_kck_cmd = {};
struct iwl_wowlan_kek_kck_material_cmd_v4 *_kek_kck_cmd = &kek_kck_cmd; struct iwl_wowlan_kek_kck_material_cmd_v4 *_kek_kck_cmd = &kek_kck_cmd;
...@@ -772,10 +771,9 @@ static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm, ...@@ -772,10 +771,9 @@ static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm,
* required locks. * required locks.
*/ */
/* /*
* Note that currently we don't propagate cmd_flags * Note that currently we don't use CMD_ASYNC in the iterator.
* to the iterator. In case of key_data.configure_keys, * In case of key_data.configure_keys, all the configured commands
* all the configured commands are SYNC, and * are SYNC, and iwl_mvm_wowlan_program_keys() will take care of
* iwl_mvm_wowlan_program_keys() will take care of
* locking/unlocking mvm->mutex. * locking/unlocking mvm->mutex.
*/ */
ieee80211_iter_keys(mvm->hw, vif, iwl_mvm_wowlan_program_keys, ieee80211_iter_keys(mvm->hw, vif, iwl_mvm_wowlan_program_keys,
...@@ -806,8 +804,7 @@ static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm, ...@@ -806,8 +804,7 @@ static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm,
} }
ret = iwl_mvm_send_cmd_pdu(mvm, WOWLAN_TSC_RSC_PARAM, ret = iwl_mvm_send_cmd_pdu(mvm, WOWLAN_TSC_RSC_PARAM,
cmd_flags, CMD_ASYNC, size,
size,
key_data.rsc_tsc); key_data.rsc_tsc);
if (ret) if (ret)
...@@ -841,7 +838,7 @@ static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm, ...@@ -841,7 +838,7 @@ static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm,
/* send relevant data according to CMD version */ /* send relevant data according to CMD version */
ret = iwl_mvm_send_cmd_pdu(mvm, ret = iwl_mvm_send_cmd_pdu(mvm,
WOWLAN_TKIP_PARAM, WOWLAN_TKIP_PARAM,
cmd_flags, size, CMD_ASYNC, size,
&tkip_data.tkip); &tkip_data.tkip);
if (ret) if (ret)
goto out; goto out;
...@@ -885,10 +882,8 @@ static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm, ...@@ -885,10 +882,8 @@ static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm,
IWL_DEBUG_WOWLAN(mvm, "setting akm %d\n", IWL_DEBUG_WOWLAN(mvm, "setting akm %d\n",
mvmvif->rekey_data.akm); mvmvif->rekey_data.akm);
ret = iwl_mvm_send_cmd_pdu(mvm, ret = iwl_mvm_send_cmd_pdu(mvm, WOWLAN_KEK_KCK_MATERIAL,
WOWLAN_KEK_KCK_MATERIAL, cmd_flags, CMD_ASYNC, cmd_size, _kek_kck_cmd);
cmd_size,
_kek_kck_cmd);
if (ret) if (ret)
goto out; goto out;
} }
...@@ -927,7 +922,7 @@ iwl_mvm_wowlan_config(struct iwl_mvm *mvm, ...@@ -927,7 +922,7 @@ iwl_mvm_wowlan_config(struct iwl_mvm *mvm,
* that isn't really a problem though. * that isn't really a problem though.
*/ */
mutex_unlock(&mvm->mutex); mutex_unlock(&mvm->mutex);
ret = iwl_mvm_wowlan_config_key_params(mvm, vif, CMD_ASYNC); ret = iwl_mvm_wowlan_config_key_params(mvm, vif);
mutex_lock(&mvm->mutex); mutex_lock(&mvm->mutex);
if (ret) if (ret)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment