diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/scan.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/scan.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c index a7f6ae3fac1d..988b1753f08b 100644 --- a/drivers/net/wireless/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/iwlwifi/mvm/scan.c | |||
@@ -306,7 +306,6 @@ int iwl_mvm_scan_request(struct iwl_mvm *mvm, | |||
306 | .id = SCAN_REQUEST_CMD, | 306 | .id = SCAN_REQUEST_CMD, |
307 | .len = { 0, }, | 307 | .len = { 0, }, |
308 | .data = { mvm->scan_cmd, }, | 308 | .data = { mvm->scan_cmd, }, |
309 | .flags = CMD_SYNC, | ||
310 | .dataflags = { IWL_HCMD_DFL_NOCOPY, }, | 309 | .dataflags = { IWL_HCMD_DFL_NOCOPY, }, |
311 | }; | 310 | }; |
312 | struct iwl_scan_cmd *cmd = mvm->scan_cmd; | 311 | struct iwl_scan_cmd *cmd = mvm->scan_cmd; |
@@ -517,7 +516,7 @@ int iwl_mvm_cancel_scan(struct iwl_mvm *mvm) | |||
517 | ARRAY_SIZE(scan_abort_notif), | 516 | ARRAY_SIZE(scan_abort_notif), |
518 | iwl_mvm_scan_abort_notif, NULL); | 517 | iwl_mvm_scan_abort_notif, NULL); |
519 | 518 | ||
520 | ret = iwl_mvm_send_cmd_pdu(mvm, SCAN_ABORT_CMD, CMD_SYNC, 0, NULL); | 519 | ret = iwl_mvm_send_cmd_pdu(mvm, SCAN_ABORT_CMD, 0, 0, NULL); |
521 | if (ret) { | 520 | if (ret) { |
522 | IWL_ERR(mvm, "Couldn't send SCAN_ABORT_CMD: %d\n", ret); | 521 | IWL_ERR(mvm, "Couldn't send SCAN_ABORT_CMD: %d\n", ret); |
523 | /* mac80211's state will be cleaned in the nic_restart flow */ | 522 | /* mac80211's state will be cleaned in the nic_restart flow */ |
@@ -749,7 +748,6 @@ int iwl_mvm_config_sched_scan(struct iwl_mvm *mvm, | |||
749 | struct iwl_scan_offload_cfg *scan_cfg; | 748 | struct iwl_scan_offload_cfg *scan_cfg; |
750 | struct iwl_host_cmd cmd = { | 749 | struct iwl_host_cmd cmd = { |
751 | .id = SCAN_OFFLOAD_CONFIG_CMD, | 750 | .id = SCAN_OFFLOAD_CONFIG_CMD, |
752 | .flags = CMD_SYNC, | ||
753 | }; | 751 | }; |
754 | struct iwl_mvm_scan_params params = {}; | 752 | struct iwl_mvm_scan_params params = {}; |
755 | 753 | ||
@@ -807,7 +805,6 @@ int iwl_mvm_config_sched_scan_profiles(struct iwl_mvm *mvm, | |||
807 | struct iwl_scan_offload_blacklist *blacklist; | 805 | struct iwl_scan_offload_blacklist *blacklist; |
808 | struct iwl_host_cmd cmd = { | 806 | struct iwl_host_cmd cmd = { |
809 | .id = SCAN_OFFLOAD_UPDATE_PROFILES_CMD, | 807 | .id = SCAN_OFFLOAD_UPDATE_PROFILES_CMD, |
810 | .flags = CMD_SYNC, | ||
811 | .len[1] = sizeof(*profile_cfg), | 808 | .len[1] = sizeof(*profile_cfg), |
812 | .dataflags[0] = IWL_HCMD_DFL_NOCOPY, | 809 | .dataflags[0] = IWL_HCMD_DFL_NOCOPY, |
813 | .dataflags[1] = IWL_HCMD_DFL_NOCOPY, | 810 | .dataflags[1] = IWL_HCMD_DFL_NOCOPY, |
@@ -898,7 +895,7 @@ int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm, | |||
898 | scan_req.flags |= | 895 | scan_req.flags |= |
899 | cpu_to_le16(IWL_SCAN_OFFLOAD_FLAG_EBS_ACCURATE_MODE); | 896 | cpu_to_le16(IWL_SCAN_OFFLOAD_FLAG_EBS_ACCURATE_MODE); |
900 | 897 | ||
901 | return iwl_mvm_send_cmd_pdu(mvm, SCAN_OFFLOAD_REQUEST_CMD, CMD_SYNC, | 898 | return iwl_mvm_send_cmd_pdu(mvm, SCAN_OFFLOAD_REQUEST_CMD, 0, |
902 | sizeof(scan_req), &scan_req); | 899 | sizeof(scan_req), &scan_req); |
903 | } | 900 | } |
904 | 901 | ||
@@ -907,7 +904,6 @@ static int iwl_mvm_send_sched_scan_abort(struct iwl_mvm *mvm) | |||
907 | int ret; | 904 | int ret; |
908 | struct iwl_host_cmd cmd = { | 905 | struct iwl_host_cmd cmd = { |
909 | .id = SCAN_OFFLOAD_ABORT_CMD, | 906 | .id = SCAN_OFFLOAD_ABORT_CMD, |
910 | .flags = CMD_SYNC, | ||
911 | }; | 907 | }; |
912 | u32 status; | 908 | u32 status; |
913 | 909 | ||