diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-09-03 03:23:41 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-09-03 03:23:41 -0400 |
commit | ae1ad26388228048db6a5f1056bd569ed2bbc4ec (patch) | |
tree | 223f50677aa00eb6f2a6529099a1005c7e43c071 /drivers/net/wireless/intel/iwlwifi/mvm/utils.c | |
parent | c84b82dd3e593db217f23c60f7edae02c76a3c4c (diff) | |
parent | 089cf7f6ecb266b6a4164919a2e69bd2f938374a (diff) |
Merge tag 'v5.3-rc7' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/utils.c')
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c index 9ecd5f09615a..b8e20a01c192 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c | |||
@@ -653,12 +653,12 @@ int iwl_mvm_reconfig_scd(struct iwl_mvm *mvm, int queue, int fifo, int sta_id, | |||
653 | * this case to clear the state indicating that station creation is in | 653 | * this case to clear the state indicating that station creation is in |
654 | * progress. | 654 | * progress. |
655 | */ | 655 | */ |
656 | int iwl_mvm_send_lq_cmd(struct iwl_mvm *mvm, struct iwl_lq_cmd *lq, bool sync) | 656 | int iwl_mvm_send_lq_cmd(struct iwl_mvm *mvm, struct iwl_lq_cmd *lq) |
657 | { | 657 | { |
658 | struct iwl_host_cmd cmd = { | 658 | struct iwl_host_cmd cmd = { |
659 | .id = LQ_CMD, | 659 | .id = LQ_CMD, |
660 | .len = { sizeof(struct iwl_lq_cmd), }, | 660 | .len = { sizeof(struct iwl_lq_cmd), }, |
661 | .flags = sync ? 0 : CMD_ASYNC, | 661 | .flags = CMD_ASYNC, |
662 | .data = { lq, }, | 662 | .data = { lq, }, |
663 | }; | 663 | }; |
664 | 664 | ||