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

Make scan WMI commands pdev level

Change-Id: I78e2d00bb5b092a564304581ede3d252e129a617
CRs-Fixed: 865207

2 files changed, 29 insertions, 2 deletions

diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h
index 36db336a68e4..85b4fc171b28 100644
--- a/target/inc/wmi_unified.h
+++ b/target/inc/wmi_unified.h
@@ -2828,7 +2828,8 @@ typedef struct {
 	 * Req Type
 	 * req_type should be WMI_SCAN_STOP_ONE, WMI_SCN_STOP_VAP_ALL or WMI_SCAN_STOP_ALL
 	 * WMI_SCAN_STOP_ONE indicates to stop a specific scan with scan_id
-	 * WMI_SCN_STOP_VAP_ALL indicates to stop all scan requests on a specific vDev with vdev_id
+	 * WMI_SCN_STOP_VAP_ALL indicates to stop all scan requests on a
+	 * specific vDev with vdev_id or pdev with pdev id
 	 * WMI_SCAN_STOP_ALL indicates to stop all scan requests in both Scheduler's queue and Scan Engine
 	 */
 	A_UINT32 req_type;
@@ -2837,6 +2838,11 @@ typedef struct {
 	 * used when req_type equals to WMI_SCN_STOP_VAP_ALL, it indexed the vDev on which to stop the scan
 	 */
 	A_UINT32 vdev_id;
+	/** pdev_id for identifying the MAC
+	 * See macros starting with WMI_PDEV_ID_ for values.
+	 * In non-DBDC case host should set it to 0
+	 */
+	A_UINT32 pdev_id;
 } wmi_stop_scan_cmd_fixed_param;
 
 #define MAX_NUM_CHAN_PER_WMI_CMD     58 /* each WMI cmd can hold 58 channel entries at most */
@@ -2887,6 +2893,12 @@ typedef struct {
 	 * for WLAN_M_STA type, there are 3 entries in the table (refer to default_scan_priority_mapping_table definition)
 	 */
 	A_UINT32 number_rows;
+	/**
+	 * pdev_id for identifying the MAC.  See macros starting with
+	 * WMI_PDEV_ID_ for values.In non-DBDC case host should
+	 * set it to 0.
+	 */
+	A_UINT32 pdev_id;
 	/**  mapping_table for a specific vdev follows this TLV
 	 *   WLAN_PRIORITY_MAPPING mapping_table[]; */
 } wmi_scan_sch_priority_table_cmd_fixed_param;
@@ -2910,6 +2922,11 @@ typedef struct {
 	A_UINT32 min_rest_time;
 	/** min rest time. Only valid if WMI_SCAN_UPDATE_MAX_REST_TIME flag is set in scan_update_flag */
 	A_UINT32 max_rest_time;
+	/**
+	 * pdev_id for identifying the MAC. See macros starting with
+	 * WMI_PDEV_ID_ for values. In non-DBDC case host should set it to 0
+	 */
+	A_UINT32 pdev_id;
 } wmi_scan_update_request_cmd_fixed_param;
 
 #define WMI_SCAN_PROBE_OUI_SPOOFED_MAC_IN_PROBE_REQ 0x1
@@ -2935,6 +2952,11 @@ typedef struct {
 	A_UINT32 ie_bitmap[WMI_IE_BITMAP_SIZE];
 	/** Number of vendor OUIs. In the TLV vendor_oui[] **/
 	A_UINT32 num_vendor_oui;
+	/**
+	 * pdev_id for identifying the MAC. See macros starting with
+	 * WMI_PDEV_ID_ for values. In non-DBDC case host should set it to 0
+	 */
+	A_UINT32 pdev_id;
 	/* Following this tlv, there comes an array of structure of type wmi_vendor_ouiwmi_vendor_oui vendor_oui[];*/
 
 } wmi_scan_prob_req_oui_cmd_fixed_param;
@@ -17794,6 +17816,11 @@ typedef struct {
 	A_UINT32 tlv_header;
 	/* globally enable/disable adaptive dwell */
 	A_UINT32 enable;
+	/**
+	 * pdev_id for identifying the MAC. See macros starting with
+	 * WMI_PDEV_ID_ for values. In non-DBDC case host should set it to 0
+	 */
+	A_UINT32 pdev_id;
 	/*
 	 * followed by TLV (tag length value) parameters array
 	 * The TLV's are:
diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h
index 42ab989c215e..518a7b6e3d15 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_ 321
+#define __WMI_REVISION_ 322
 
 /** The Version Namespace should not be normally changed. Only
  *  host and firmware of the same WMI namespace will work