diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-29 07:20:52 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-29 07:20:52 +0100 |
| commit | f0718d792b8a6d4b5ddc929e418ac57cc4897375 (patch) | |
| tree | 3dbaa824ce380e99709fae47c047383ca39c983a /drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | |
| parent | efe8eaf7b525f1be26fe20d723d2bfbfcd7455fd (diff) | |
| parent | b59dfdaef173677b0b7e10f375226c0a1114fd20 (diff) | |
| download | talos-op-linux-f0718d792b8a6d4b5ddc929e418ac57cc4897375.tar.gz talos-op-linux-f0718d792b8a6d4b5ddc929e418ac57cc4897375.zip | |
Merge branch 'linus' into perf/urgent, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/fw/api/scan.h')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h b/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h index a17c4a79b8d4..18741889ec30 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h @@ -262,6 +262,7 @@ enum iwl_scan_channel_flags { IWL_SCAN_CHANNEL_FLAG_EBS = BIT(0), IWL_SCAN_CHANNEL_FLAG_EBS_ACCURATE = BIT(1), IWL_SCAN_CHANNEL_FLAG_CACHE_ADD = BIT(2), + IWL_SCAN_CHANNEL_FLAG_EBS_FRAG = BIT(3), }; /* struct iwl_scan_channel_opt - CHANNEL_OPTIMIZATION_API_S @@ -595,9 +596,12 @@ enum iwl_umac_scan_general_flags { * enum iwl_umac_scan_general_flags2 - UMAC scan general flags #2 * @IWL_UMAC_SCAN_GEN_FLAGS2_NOTIF_PER_CHNL: Whether to send a complete * notification per channel or not. + * @IWL_UMAC_SCAN_GEN_FLAGS2_ALLOW_CHNL_REORDER: Whether to allow channel + * reorder optimization or not. */ enum iwl_umac_scan_general_flags2 { - IWL_UMAC_SCAN_GEN_FLAGS2_NOTIF_PER_CHNL = BIT(0), + IWL_UMAC_SCAN_GEN_FLAGS2_NOTIF_PER_CHNL = BIT(0), + IWL_UMAC_SCAN_GEN_FLAGS2_ALLOW_CHNL_REORDER = BIT(1), }; /** |
