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

Propagation from qcacld-2.0 to qcacld-3.0.

Add WMI_ prefix to fix name conflict caused by recently-added
ENCRYPT flag def
Fix name conflict caused by ENCRYPT flag def added in CL 1641391

Change-Id: I398bec5ef53fb925fa7e4fbceaa62ef62eb46e68
CRs-Fixed: 865207
This commit is contained in:
Poddar, Siddarth
2016-09-20 19:44:13 +05:30
committed by Gerrit - the friendly Code Review server
szülő f363616e2f
commit 3b0a18f05d
2 fájl változott, egészen pontosan 6 új sor hozzáadva és 6 régi sor törölve

Fájl megtekintése

@@ -15147,10 +15147,10 @@ typedef struct {
/* DISA feature related data structures */
#define MAX_MAC_HEADER_LEN 32
typedef enum {
INVALID,
ENCRYPT = 1,
DECRYPT = 2,
} ENCRYPT_DECRYPT_FLAG;
WMI_ENCRYPT_DECRYPT_FLAG_INVALID,
WMI_ENCRYPT = 1,
WMI_DECRYPT = 2,
} WMI_ENCRYPT_DECRYPT_FLAG;
typedef struct {
/**
@@ -15160,7 +15160,7 @@ typedef struct {
A_UINT32 tlv_header;
/** unique id identifying the VDEV, generated by the caller */
A_UINT32 vdev_id;
ENCRYPT_DECRYPT_FLAG key_flag;
A_UINT32 key_flag; /* WMI_ENCRYPT_DECRYPT_FLAG */
A_UINT32 key_idx;
A_UINT32 key_cipher;
A_UINT32 key_len; /* units = bytes */