diff options
| author | Himanshu Agarwal <himanaga@qti.qualcomm.com> | 2016-05-20 11:01:50 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-05-25 02:30:28 -0700 |
| commit | 0da2cca83021da454325e30221baa2ef1a3fdc98 (patch) | |
| tree | 6539a427141f78d3fa6e7f9facad8cc12906d639 | |
| parent | 5ac1339599db94bd898fdadeef8ff39b21e79aaf (diff) | |
qcacld-2.0: CL 1513397 – update fw common interface files
Define 2 sub-CCKM auth types
Deprecate WOW_NAN_RTT event and reason, and use their values
for WOW_OEM_RESPONSE
Change-Id: I0db10a599f4bbbdf23e5968fa5dab59b722efa30
CRs-Fixed: 865207
| -rw-r--r-- | CORE/SERVICES/COMMON/wmi_unified.h | 10 | ||||
| -rw-r--r-- | CORE/SERVICES/COMMON/wmi_version.h | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/CORE/SERVICES/COMMON/wmi_unified.h b/CORE/SERVICES/COMMON/wmi_unified.h index f462369a9ccc..7be53de16f88 100644 --- a/CORE/SERVICES/COMMON/wmi_unified.h +++ b/CORE/SERVICES/COMMON/wmi_unified.h @@ -6926,7 +6926,7 @@ enum { WMI_AUTH_AUTO , /* Auto */ WMI_AUTH_WPA , /* WPA */ WMI_AUTH_RSNA , /* WPA2/RSNA */ - WMI_AUTH_CCKM , /* CCK */ + WMI_AUTH_CCKM , /* CCKM */ WMI_AUTH_WAPI ,/* WAPI */ WMI_AUTH_AUTO_PSK, WMI_AUTH_WPA_PSK, @@ -6936,6 +6936,8 @@ enum { WMI_AUTH_FT_RSNA_PSK, WMI_AUTH_RSNA_PSK_SHA256, WMI_AUTH_RSNA_8021X_SHA256, + WMI_AUTH_CCKM_WPA, + WMI_AUTH_CCKM_RSNA, }; typedef struct { @@ -7735,7 +7737,8 @@ typedef enum event_type_e { WOW_IOAC_SOCK_EVENT, WOW_NLO_SCAN_COMPLETE_EVENT, WOW_NAN_DATA_EVENT, - WOW_NAN_RTT_EVENT, + WOW_NAN_RTT_EVENT, /* DEPRECATED, UNUSED */ + WOW_OEM_RESPONSE_EVENT = WOW_NAN_RTT_EVENT, /* reuse deprecated event value */ WOW_TDLS_CONN_TRACKER_EVENT, WOW_CRITICAL_LOG_EVENT, } WOW_WAKE_EVENT_TYPE; @@ -7783,7 +7786,8 @@ typedef enum wake_reason_e { WOW_REASON_ACTION_FRAME_RECV, WOW_REASON_BPF_ALLOW, WOW_REASON_NAN_DATA, - WOW_REASON_NAN_RTT, + WOW_REASON_NAN_RTT, /* DEPRECATED, UNUSED */ + WOW_REASON_OEM_RESPONSE_EVENT = WOW_REASON_NAN_RTT, /* reuse deprecated reason value */ WOW_REASON_TDLS_CONN_TRACKER_EVENT, WOW_REASON_CRITICAL_LOG, WOW_REASON_DEBUG_TEST = 0xFF, diff --git a/CORE/SERVICES/COMMON/wmi_version.h b/CORE/SERVICES/COMMON/wmi_version.h index 4e46242c797d..85d0b8f94a8d 100644 --- a/CORE/SERVICES/COMMON/wmi_version.h +++ b/CORE/SERVICES/COMMON/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility. */ -#define __WMI_REVISION_ 250 +#define __WMI_REVISION_ 252 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work |