diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-01-20 09:23:27 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-01-22 17:55:12 +0200 |
| commit | d5234cb2f4d2bc15d088dac17d02260d2613be28 (patch) | |
| tree | 091da929d43c132604bdac188067b67eb3854e7e /drivers/net/wireless/iwlwifi/iwl-fw-file.h | |
| parent | bd1ba664147ae271e592aa90266cf9aba6efe116 (diff) | |
| parent | 2cee4762c528a9bd2cdff793197bf591a2196c11 (diff) | |
| download | linux-d5234cb2f4d2bc15d088dac17d02260d2613be28.tar.gz linux-d5234cb2f4d2bc15d088dac17d02260d2613be28.tar.bz2 linux-d5234cb2f4d2bc15d088dac17d02260d2613be28.zip | |
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Conflicts:
drivers/net/wireless/iwlwifi/iwl-fw-file.h
drivers/net/wireless/iwlwifi/mvm/scan.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-fw-file.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-fw-file.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw-file.h b/drivers/net/wireless/iwlwifi/iwl-fw-file.h index 115e604e1ac9..4aa26b2e2e23 100644 --- a/drivers/net/wireless/iwlwifi/iwl-fw-file.h +++ b/drivers/net/wireless/iwlwifi/iwl-fw-file.h @@ -246,6 +246,7 @@ enum iwl_ucode_tlv_flag { * the actual dwell time. * @IWL_UCODE_TLV_API_SCD_CFG: This firmware can configure the scheduler * through the dedicated host command. + * @IWL_UCODE_TLV_API_SINGLE_SCAN_EBS: EBS is supported for single scans too. * @IWL_UCODE_TLV_API_ASYNC_DTM: Async temperature notifications are supported. */ enum iwl_ucode_tlv_api { @@ -256,6 +257,7 @@ enum iwl_ucode_tlv_api { IWL_UCODE_TLV_API_FRAGMENTED_SCAN = BIT(8), IWL_UCODE_TLV_API_BASIC_DWELL = BIT(13), IWL_UCODE_TLV_API_SCD_CFG = BIT(15), + IWL_UCODE_TLV_API_SINGLE_SCAN_EBS = BIT(16), IWL_UCODE_TLV_API_ASYNC_DTM = BIT(17), }; |