qcacld-3.0: CL 1706778 - update fw common interface files

WMI and NAN MSG changes for NAN security support
WMI and NAN MSG changes for NAN security support

Change-Id: I40e07f668eefc0b243e59328c15ba45c5cdd5848
CRs-Fixed: 865207

3 files changed, 22 insertions, 4 deletions

diff --git a/target/inc/wmi_tlv_defs.h b/target/inc/wmi_tlv_defs.h
index 9ab1d36d0d95..9bf7f871ed0f 100644
--- a/target/inc/wmi_tlv_defs.h
+++ b/target/inc/wmi_tlv_defs.h
@@ -2540,7 +2540,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_NDI_GET_CAP_REQ_CMDID);
 	WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_ndp_initiator_req_fixed_param, wmi_ndp_initiator_req_fixed_param_PROTOTYPE, fixed_param, WMITLV_SIZE_FIX) \
 	WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_channel, wmi_channel, channel, WMITLV_SIZE_FIX) \
 	WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_cfg, WMITLV_SIZE_VAR) \
-	WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_app_info, WMITLV_SIZE_VAR)
+	WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_app_info, WMITLV_SIZE_VAR) \
+	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_pmk, WMITLV_SIZE_VAR)
 WMITLV_CREATE_PARAM_STRUC(WMI_NDP_INITIATOR_REQ_CMDID);
 
 /*
@@ -2553,7 +2554,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_NDP_INITIATOR_REQ_CMDID);
 #define WMITLV_TABLE_WMI_NDP_RESPONDER_REQ_CMDID(id, op, buf, len) \
 	WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_ndp_responder_rsp_event_fixed_param, wmi_ndp_responder_req_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
 	WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_cfg, WMITLV_SIZE_VAR) \
-	WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_app_info, WMITLV_SIZE_VAR)
+	WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_app_info, WMITLV_SIZE_VAR) \
+	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_pmk, WMITLV_SIZE_VAR)
 WMITLV_CREATE_PARAM_STRUC(WMI_NDP_RESPONDER_REQ_CMDID);
 
 /*
@@ -3699,7 +3701,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_NDP_END_RSP_EVENTID);
 #define WMITLV_TABLE_WMI_NDP_INDICATION_EVENTID(id, op, buf, len) \
 	WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_ndp_indication_event_fixed_param, wmi_ndp_indication_event_fixed_param_PROTOTYPE, fixed_param, WMITLV_SIZE_FIX) \
 	WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_cfg, WMITLV_SIZE_VAR) \
-	WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_app_info, WMITLV_SIZE_VAR)
+	WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_app_info, WMITLV_SIZE_VAR) \
+	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_scid, WMITLV_SIZE_VAR)
 WMITLV_CREATE_PARAM_STRUC(WMI_NDP_INDICATION_EVENTID);
 
 /**
diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h
index 96cd5bcd7e8a..1a4cb1723fb1 100644
--- a/target/inc/wmi_unified.h
+++ b/target/inc/wmi_unified.h
@@ -12665,12 +12665,17 @@ typedef struct {
 	A_UINT32 ndp_app_info_len;
 	/** NDP channel configuration type defined in wmi_ndp_channel_cfg */
 	A_UINT32 ndp_channel_cfg;
+	/**  NAN Cipher Suite Shared Key */
+	A_UINT32 nan_csid;
+	/** Actual number of bytes in TLV nan_pmk */
+	A_UINT32 nan_pmk_len;
 	/**
 	 * TLV (tag length value ) parameters follow the ndp_initiator_req
 	 * structure. The TLV's are:
 	 * wmi_channel channel;
 	 * A_UINT8 ndp_cfg[];
 	 * A_UINT8 ndp_app_info[];
+	 * A_UINT8 nan_pmk[];
 	 */
 } wmi_ndp_initiator_req_fixed_param_PROTOTYPE;
 
@@ -12701,11 +12706,16 @@ typedef struct {
 	A_UINT32 ndp_cfg_len;
 	/** Number of bytes in TLV ndp_app_info */
 	A_UINT32 ndp_app_info_len;
+	/**  NAN Cipher Suite Shared Key */
+	A_UINT32 nan_csid;
+	/** Actual number of bytes in TLV nan_pmk */
+	A_UINT32 nan_pmk_len;
 	/**
 	 * TLV (tag length value ) parameters follow the ndp_responder_req
 	 * structure. The TLV's are:
 	 * A_UINT8 ndp_cfg[];
 	 * A_UINT8 ndp_app_info[];
+	 * A_UINT8 nan_pmk[];
 	 */
 } wmi_ndp_responder_req_fixed_param_PROTOTYPE;
 
@@ -12969,11 +12979,16 @@ typedef struct {
 	A_UINT32 ndp_cfg_len;
 	/** Number of bytes in TLV wmi_ndp_app_info */
 	A_UINT32 ndp_app_info_len;
+	/** Peer NAN Cipher Suite Shared Key */
+	A_UINT32 nan_csid;
+	/** Actual number of bytes in TLV nan_scid */
+	A_UINT32 nan_scid_len;
 	/**
 	 * TLV (tag length value ) parameters follow the ndp_indication
 	 * structure. The TLV's are:
 	 * A_UINT8 ndp_cfg[];
 	 * A_UINT8 ndp_app_info[];
+	 * A_UINT8 nan_scid[];
 	 */
 } wmi_ndp_indication_event_fixed_param_PROTOTYPE;
 
diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h
index e1637b6655df..91517b5971b5 100644
--- a/target/inc/wmi_version.h
+++ b/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_ 314
+#define __WMI_REVISION_ 315
 
 /** The Version Namespace should not be normally changed. Only
  *  host and firmware of the same WMI namespace will work