aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-fw.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-fw.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-fw.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw.h b/drivers/net/wireless/iwlwifi/iwl-fw.h
index b1a33322b9ba..1bb5193c5b1b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw.h
@@ -65,6 +65,8 @@
65#include <linux/types.h> 65#include <linux/types.h>
66#include <net/mac80211.h> 66#include <net/mac80211.h>
67 67
68#include "iwl-fw-file.h"
69
68/** 70/**
69 * enum iwl_ucode_tlv_flag - ucode API flags 71 * enum iwl_ucode_tlv_flag - ucode API flags
70 * @IWL_UCODE_TLV_FLAGS_PAN: This is PAN capable microcode; this previously 72 * @IWL_UCODE_TLV_FLAGS_PAN: This is PAN capable microcode; this previously
@@ -118,11 +120,19 @@ enum iwl_ucode_tlv_flag {
118/** 120/**
119 * enum iwl_ucode_tlv_api - ucode api 121 * enum iwl_ucode_tlv_api - ucode api
120 * @IWL_UCODE_TLV_API_WOWLAN_CONFIG_TID: wowlan config includes tid field. 122 * @IWL_UCODE_TLV_API_WOWLAN_CONFIG_TID: wowlan config includes tid field.
123 * @IWL_UCODE_TLV_CAPA_EXTENDED_BEACON: Support Extended beacon notification
124 * @IWL_UCODE_TLV_API_BT_COEX_SPLIT: new API for BT Coex
121 * @IWL_UCODE_TLV_API_CSA_FLOW: ucode can do unbind-bind flow for CSA. 125 * @IWL_UCODE_TLV_API_CSA_FLOW: ucode can do unbind-bind flow for CSA.
126 * @IWL_UCODE_TLV_API_DISABLE_STA_TX: ucode supports tx_disable bit.
127 * @IWL_UCODE_TLV_API_LMAC_SCAN: This ucode uses LMAC unified scan API.
122 */ 128 */
123enum iwl_ucode_tlv_api { 129enum iwl_ucode_tlv_api {
124 IWL_UCODE_TLV_API_WOWLAN_CONFIG_TID = BIT(0), 130 IWL_UCODE_TLV_API_WOWLAN_CONFIG_TID = BIT(0),
131 IWL_UCODE_TLV_CAPA_EXTENDED_BEACON = BIT(1),
132 IWL_UCODE_TLV_API_BT_COEX_SPLIT = BIT(3),
125 IWL_UCODE_TLV_API_CSA_FLOW = BIT(4), 133 IWL_UCODE_TLV_API_CSA_FLOW = BIT(4),
134 IWL_UCODE_TLV_API_DISABLE_STA_TX = BIT(5),
135 IWL_UCODE_TLV_API_LMAC_SCAN = BIT(6),
126}; 136};
127 137
128/** 138/**
@@ -179,6 +189,7 @@ enum iwl_ucode_sec {
179 189
180struct iwl_ucode_capabilities { 190struct iwl_ucode_capabilities {
181 u32 max_probe_length; 191 u32 max_probe_length;
192 u32 n_scan_channels;
182 u32 standard_phy_calibration_size; 193 u32 standard_phy_calibration_size;
183 u32 flags; 194 u32 flags;
184 u32 api[IWL_API_ARRAY_SIZE]; 195 u32 api[IWL_API_ARRAY_SIZE];
@@ -312,6 +323,7 @@ struct iwl_fw {
312 bool mvm_fw; 323 bool mvm_fw;
313 324
314 struct ieee80211_cipher_scheme cs[IWL_UCODE_MAX_CS]; 325 struct ieee80211_cipher_scheme cs[IWL_UCODE_MAX_CS];
326 u8 human_readable[FW_VER_HUMAN_READABLE_SZ];
315}; 327};
316 328
317#endif /* __iwl_fw_h__ */ 329#endif /* __iwl_fw_h__ */