diff options
| author | CNSS_WLAN Service <cnssbldsw@qualcomm.com> | 2018-09-19 03:41:26 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-19 03:41:26 -0700 |
| commit | c29d828640e29a56002a4ad974180f53a68a745f (patch) | |
| tree | 225f5828d5a106cd91ae8787d637a675a53057c0 | |
| parent | 0fb168eff8336b2c66c9a989db3472d8e19929b8 (diff) | |
| parent | b55f3a3b94dd05741856c7d3b24eb3df5e06bf9f (diff) | |
Merge "qcacld-2.0: CL 5157294 - Update fw common interface files" into wlan-cld2.driver.lnx.1.0
| -rw-r--r-- | CORE/SERVICES/COMMON/wmi_services.h | 4 | ||||
| -rw-r--r-- | CORE/SERVICES/COMMON/wmi_tlv_defs.h | 6 | ||||
| -rw-r--r-- | CORE/SERVICES/COMMON/wmi_unified.h | 6 |
3 files changed, 14 insertions, 2 deletions
diff --git a/CORE/SERVICES/COMMON/wmi_services.h b/CORE/SERVICES/COMMON/wmi_services.h index 6745da7c85db..6ff7e4664963 100644 --- a/CORE/SERVICES/COMMON/wmi_services.h +++ b/CORE/SERVICES/COMMON/wmi_services.h @@ -351,6 +351,10 @@ typedef enum { WMI_SERVICE_INFRA_MBSSID=161, /* support infra multi-BSSID feature */ WMI_SERVICE_OBSS_SPATIAL_REUSE=162, /* support spatial reuse feature */ WMI_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT=163, /* Support different beacon intervals on different VDEVs */ + WMI_SERVICE_NAN_DBS_SUPPORT=164, /* Support DBS for NAN discovery interface */ + WMI_SERVICE_NDI_DBS_SUPPORT=165, /* Support DBS for NAN data interface */ + WMI_SERVICE_NAN_SAP_SUPPORT=166, /* Support SAP Concurrency for NAN Discovery interface */ + WMI_SERVICE_NDI_SAP_SUPPORT=167, /* Support SAP Concurrency for NAN Data interface */ /******* ADD NEW SERVICES HERE *******/ diff --git a/CORE/SERVICES/COMMON/wmi_tlv_defs.h b/CORE/SERVICES/COMMON/wmi_tlv_defs.h index 81501ad34142..5252accff71b 100644 --- a/CORE/SERVICES/COMMON/wmi_tlv_defs.h +++ b/CORE/SERVICES/COMMON/wmi_tlv_defs.h @@ -918,6 +918,7 @@ typedef enum { WMITLV_TAG_STRUC_wmi_ndp_transport_ip_param, WMITLV_TAG_STRUC_wmi_obss_spatial_reuse_set_cmd_fixed_param, WMITLV_TAG_STRUC_wmi_esp_estimate_event_fixed_param, + WMITLV_TAG_STRUC_wmi_nan_host_config_param, } WMITLV_TAG_ID; /* @@ -2957,8 +2958,9 @@ WMITLV_CREATE_PARAM_STRUC(WMI_DEL_PROACTIVE_ARP_RSP_PATTERN_CMDID); /* NaN Request */ #define WMITLV_TABLE_WMI_NAN_CMDID(id,op,buf,len) \ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_nan_cmd_param, wmi_nan_cmd_param, fixed_param, WMITLV_SIZE_FIX) \ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, data, WMITLV_SIZE_VAR) + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_nan_cmd_param, wmi_nan_cmd_param, fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, data, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_nan_host_config_param, host_config, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_NAN_CMDID); /* NAN Data Get Capabilities Cmd */ diff --git a/CORE/SERVICES/COMMON/wmi_unified.h b/CORE/SERVICES/COMMON/wmi_unified.h index fd0213030a6c..3c1f6a0da768 100644 --- a/CORE/SERVICES/COMMON/wmi_unified.h +++ b/CORE/SERVICES/COMMON/wmi_unified.h @@ -16054,6 +16054,12 @@ typedef struct { } wmi_nan_cmd_param; typedef struct { + A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_nan_host_config_param */ + A_UINT32 nan_2g_disc_disable:1; /** This bit when set to 1 indicate NAN 2G discovery should be disabled */ + A_UINT32 nan_5g_disc_disable:1; /** This bit when set to 1 indicate NAN 5G discovery should be disabled */ +} wmi_nan_host_config_param; + +typedef struct { A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_nan_event_hdr */ A_UINT32 data_len; /** length in byte of data[]. */ /* This structure is used to send REQ binary blobs |