diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-11-25 07:53:57 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-11-25 07:53:57 +0200 |
| commit | e7331845df48cd7905d0ac4452a9244446583e41 (patch) | |
| tree | 92a4d61292c467674b3202bb978bc249044e47a6 /drivers/net/wireless/iwlwifi/iwl-fw.h | |
| parent | dcad8e4299bf81f8795b44677036dfa490c9fb15 (diff) | |
| parent | 5ac6c72e594471acfa5b00210c51d533a73413ad (diff) | |
| download | lwn-e7331845df48cd7905d0ac4452a9244446583e41.tar.gz lwn-e7331845df48cd7905d0ac4452a9244446583e41.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.h
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-fw.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-fw.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw.h b/drivers/net/wireless/iwlwifi/iwl-fw.h index a94d244459d7..959a25a75f9d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-fw.h +++ b/drivers/net/wireless/iwlwifi/iwl-fw.h @@ -158,6 +158,7 @@ enum iwl_ucode_tlv_api { * @IWL_UCODE_TLV_CAPA_DQA_SUPPORT: supports dynamic queue allocation (DQA), * which also implies support for the scheduler configuration command * @IWL_UCODE_TLV_CAPA_TDLS_CHANNEL_SWITCH: supports TDLS channel switching + * @IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT: supports Hot Spot Command */ enum iwl_ucode_tlv_capa { IWL_UCODE_TLV_CAPA_D0I3_SUPPORT = BIT(0), @@ -169,6 +170,7 @@ enum iwl_ucode_tlv_capa { IWL_UCODE_TLV_CAPA_QUIET_PERIOD_SUPPORT = BIT(11), IWL_UCODE_TLV_CAPA_DQA_SUPPORT = BIT(12), IWL_UCODE_TLV_CAPA_TDLS_CHANNEL_SWITCH = BIT(13), + IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT = BIT(18), }; /* The default calibrate table size if not specified by firmware file */ |