Browse Source

qcacld-3.0: CL 1513397 – update fw common interface files

Propagation from qcacld-2.0 to qcacld-3.0

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
Himanshu Agarwal 9 years ago
parent
commit
82972fd824
2 changed files with 10 additions and 4 deletions
  1. 9 3
      target/inc/wmi_unified.h
  2. 1 1
      target/inc/wmi_version.h

+ 9 - 3
target/inc/wmi_unified.h

@@ -7285,7 +7285,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,
@@ -7295,6 +7295,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 {
@@ -8137,7 +8139,9 @@ 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 */
+	/* reuse deprecated event value */
+	WOW_OEM_RESPONSE_EVENT = WOW_NAN_RTT_EVENT,
 	WOW_TDLS_CONN_TRACKER_EVENT,
 	WOW_CRITICAL_LOG_EVENT,
 } WOW_WAKE_EVENT_TYPE;
@@ -8185,7 +8189,9 @@ 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 */
+	/* reuse deprecated reason value */
+	WOW_REASON_OEM_RESPONSE_EVENT = WOW_REASON_NAN_RTT,
 	WOW_REASON_TDLS_CONN_TRACKER_EVENT,
 	WOW_REASON_CRITICAL_LOG,
 	WOW_REASON_DEBUG_TEST = 0xFF,

+ 1 - 1
target/inc/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