diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 5 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/scan.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h index c3782b48ded1..b3ed59237cba 100644 --- a/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h +++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | |||
@@ -530,14 +530,13 @@ struct iwl_scan_offload_schedule { | |||
530 | /* | 530 | /* |
531 | * iwl_scan_offload_flags | 531 | * iwl_scan_offload_flags |
532 | * | 532 | * |
533 | * IWL_SCAN_OFFLOAD_FLAG_FILTER_SSID: filter mode - upload every beacon or match | 533 | * IWL_SCAN_OFFLOAD_FLAG_PASS_ALL: pass all results - no filtering. |
534 | * ssid list. | ||
535 | * IWL_SCAN_OFFLOAD_FLAG_CACHED_CHANNEL: add cached channels to partial scan. | 534 | * IWL_SCAN_OFFLOAD_FLAG_CACHED_CHANNEL: add cached channels to partial scan. |
536 | * IWL_SCAN_OFFLOAD_FLAG_ENERGY_SCAN: use energy based scan before partial scan | 535 | * IWL_SCAN_OFFLOAD_FLAG_ENERGY_SCAN: use energy based scan before partial scan |
537 | * on A band. | 536 | * on A band. |
538 | */ | 537 | */ |
539 | enum iwl_scan_offload_flags { | 538 | enum iwl_scan_offload_flags { |
540 | IWL_SCAN_OFFLOAD_FLAG_FILTER_SSID = BIT(0), | 539 | IWL_SCAN_OFFLOAD_FLAG_PASS_ALL = BIT(0), |
541 | IWL_SCAN_OFFLOAD_FLAG_CACHED_CHANNEL = BIT(2), | 540 | IWL_SCAN_OFFLOAD_FLAG_CACHED_CHANNEL = BIT(2), |
542 | IWL_SCAN_OFFLOAD_FLAG_ENERGY_SCAN = BIT(3), | 541 | IWL_SCAN_OFFLOAD_FLAG_ENERGY_SCAN = BIT(3), |
543 | }; | 542 | }; |
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c index e0cd100b40cd..67d7b8defa0d 100644 --- a/drivers/net/wireless/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/iwlwifi/mvm/scan.c | |||
@@ -817,11 +817,10 @@ int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm, | |||
817 | IWL_DEBUG_SCAN(mvm, | 817 | IWL_DEBUG_SCAN(mvm, |
818 | "Sending scheduled scan with filtering, filter len %d\n", | 818 | "Sending scheduled scan with filtering, filter len %d\n", |
819 | req->n_match_sets); | 819 | req->n_match_sets); |
820 | scan_req.flags |= | ||
821 | cpu_to_le16(IWL_SCAN_OFFLOAD_FLAG_FILTER_SSID); | ||
822 | } else { | 820 | } else { |
823 | IWL_DEBUG_SCAN(mvm, | 821 | IWL_DEBUG_SCAN(mvm, |
824 | "Sending Scheduled scan without filtering\n"); | 822 | "Sending Scheduled scan without filtering\n"); |
823 | scan_req.flags |= cpu_to_le16(IWL_SCAN_OFFLOAD_FLAG_PASS_ALL); | ||
825 | } | 824 | } |
826 | 825 | ||
827 | return iwl_mvm_send_cmd_pdu(mvm, SCAN_OFFLOAD_REQUEST_CMD, CMD_SYNC, | 826 | return iwl_mvm_send_cmd_pdu(mvm, SCAN_OFFLOAD_REQUEST_CMD, CMD_SYNC, |