summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrishna Kumaar Natarajan <kknatara@qca.qualcomm.com>2014-09-24 16:29:35 -0700
committerAnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com>2014-09-25 17:32:51 +0530
commitfddbd66f4da1f91187756efaa298c270b5b761a1 (patch)
tree34f3d2e9e87cc47b4629ed6528a4e2808f969043
parentc035827c63d89ebdeaede68f8bea41e981841b3c (diff)
qcacld: CL 1096739 - update fw common interface files
This change set update the fw common interface files associated with the CL 1096739 Change-Id: Ib5f2a9bbad88ba1e7d2f927baa79d949085c3aae CRs-Fixed: 729810
-rw-r--r--CORE/SERVICES/COMMON/wmi_tlv_defs.h11
-rw-r--r--CORE/SERVICES/COMMON/wmi_unified.h16
-rw-r--r--CORE/SERVICES/COMMON/wmi_version.h2
-rw-r--r--CORE/SERVICES/WMI/wmi_unified.c1
4 files changed, 27 insertions, 3 deletions
diff --git a/CORE/SERVICES/COMMON/wmi_tlv_defs.h b/CORE/SERVICES/COMMON/wmi_tlv_defs.h
index d10e73019f5d..0976cdf183e7 100644
--- a/CORE/SERVICES/COMMON/wmi_tlv_defs.h
+++ b/CORE/SERVICES/COMMON/wmi_tlv_defs.h
@@ -509,7 +509,8 @@ typedef enum {
WMITLV_TAG_STRUC_wmi_tpc_chainmask_config_cmd_fixed_param,
WMITLV_TAG_STRUC_wmi_ric_tspec,
WMITLV_TAG_STRUC_wmi_tpc_chainmask_config,
- WMITLV_TAG_STRUCT_wmi_ipa_offload_enable_disable_cmd_fixed_param
+ WMITLV_TAG_STRUCT_wmi_ipa_offload_enable_disable_cmd_fixed_param,
+ WMITLV_TAG_STRUC_wmi_scan_prob_req_oui_cmd_fixed_param
} WMITLV_TAG_ID;
/*
@@ -698,7 +699,8 @@ typedef enum {
OP(WMI_ROAM_SET_RIC_REQUEST_CMDID) \
OP(WMI_PDEV_GET_TEMPERATURE_CMDID) \
OP(WMI_SET_DHCP_SERVER_OFFLOAD_CMDID) \
- OP(WMI_IPA_OFFLOAD_ENABLE_DISABLE_CMDID)
+ OP(WMI_IPA_OFFLOAD_ENABLE_DISABLE_CMDID)\
+ OP(WMI_SCAN_PROB_REQ_OUI_CMDID)
@@ -1613,6 +1615,11 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_RESUME_CMDID);
WMITLV_CREATE_PARAM_STRUC(WMI_SCAN_UPDATE_REQUEST_CMDID);
+#define WMITLV_TABLE_WMI_SCAN_PROB_REQ_OUI_CMDID(id,op,buf,len) \
+ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_scan_prob_req_oui_cmd_fixed_param, wmi_scan_prob_req_oui_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
+
+WMITLV_CREATE_PARAM_STRUC(WMI_SCAN_PROB_REQ_OUI_CMDID);
+
#define WMITLV_TABLE_WMI_CHATTER_ADD_COALESCING_FILTER_CMDID(id,op,buf,len) \
WMITLV_ELEM(id,op,buf,len,WMITLV_TAG_STRUC_wmi_chatter_coalescing_add_filter_cmd_fixed_param, wmi_chatter_coalescing_add_filter_cmd_fixed_param, fixed_param,WMITLV_SIZE_FIX) \
WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, chatter_pkt_coalescing_filter, coalescing_filter, WMITLV_SIZE_VAR)
diff --git a/CORE/SERVICES/COMMON/wmi_unified.h b/CORE/SERVICES/COMMON/wmi_unified.h
index 67467e7b198f..6c7f83ca72b2 100644
--- a/CORE/SERVICES/COMMON/wmi_unified.h
+++ b/CORE/SERVICES/COMMON/wmi_unified.h
@@ -204,6 +204,9 @@ typedef enum {
*/
WMI_SCAN_UPDATE_REQUEST_CMDID,
+ /** set OUI to be used in probe request if enabled */
+ WMI_SCAN_PROB_REQ_OUI_CMDID,
+
/* PDEV(physical device) specific commands */
/** set regulatorty ctl id used by FW to determine the exact ctl power limits */
WMI_PDEV_SET_REGDOMAIN_CMDID=WMI_CMD_GRP_START_ID(WMI_GRP_PDEV),
@@ -1689,6 +1692,10 @@ typedef struct {
#define WMI_SCAN_ADD_TPC_IE_IN_PROBE_REQ 0x400
/** add DS content in probe req frame */
#define WMI_SCAN_ADD_DS_IE_IN_PROBE_REQ 0x800
+/** use random mac address for TA for probe request frame and add
+ * oui specified by WMI_SCAN_PROB_REQ_OUI_CMDID to the probe req frame.
+ * if oui is not set by WMI_SCAN_PROB_REQ_OUI_CMDID then the flag is ignored*/
+#define WMI_SCAN_ADD_SPOOFED_MAC_IN_PROBE_REQ 0x1000
/** WMI_SCAN_CLASS_MASK must be the same value as IEEE80211_SCAN_CLASS_MASK */
#define WMI_SCAN_CLASS_MASK 0xFF000000
@@ -1796,6 +1803,15 @@ typedef struct {
A_UINT32 max_rest_time;
} wmi_scan_update_request_cmd_fixed_param;
+typedef struct {
+ A_UINT32 tlv_header;
+ /** oui to be used in probe request frame when random mac addresss is
+ * requested part of scan parameters. this is applied to both FW internal scans and
+ * host initated scans. host can request for random mac address with
+ * WMI_SCAN_ADD_SPOOFED_MAC_IN_PROBE_REQ flag. */
+ A_UINT32 prob_req_oui;
+} wmi_scan_prob_req_oui_cmd_fixed_param;
+
enum wmi_scan_event_type {
WMI_SCAN_EVENT_STARTED=0x1,
WMI_SCAN_EVENT_COMPLETED=0x2,
diff --git a/CORE/SERVICES/COMMON/wmi_version.h b/CORE/SERVICES/COMMON/wmi_version.h
index 9de9f5840fa6..4c582eb905b0 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_ 67
+#define __WMI_REVISION_ 68
/** The Version Namespace should not be normally changed. Only
* host and firmware of the same WMI namespace will work
diff --git a/CORE/SERVICES/WMI/wmi_unified.c b/CORE/SERVICES/WMI/wmi_unified.c
index 1c32d2ac4a73..cfbe1b33b7ed 100644
--- a/CORE/SERVICES/WMI/wmi_unified.c
+++ b/CORE/SERVICES/WMI/wmi_unified.c
@@ -587,6 +587,7 @@ static u_int8_t* get_wmi_cmd_string(WMI_CMD_ID wmi_command)
CASE_RETURN_STRING(WMI_SET_DHCP_SERVER_OFFLOAD_CMDID);
CASE_RETURN_STRING(WMI_TPC_CHAINMASK_CONFIG_CMDID);
CASE_RETURN_STRING(WMI_IPA_OFFLOAD_ENABLE_DISABLE_CMDID);
+ CASE_RETURN_STRING(WMI_SCAN_PROB_REQ_OUI_CMDID);
}
return "Invalid WMI cmd";
}