Sfoglia il codice sorgente

qcacmn: Fix two enum members using same name

Fix the conflict between the host and fw enum
for mlo teardown reason.

CRs-Fixed: 3610563
Change-Id: I20638ed0cbe6b88e20f48815c236e92b833a34a9
Pragaspathi Thilagaraj 1 anno fa
parent
commit
1c1ebf792c

+ 2 - 2
umac/mlo_mgr/src/wlan_mlo_mgr_setup.c

@@ -1022,7 +1022,7 @@ static void mlo_send_teardown_req(struct wlan_objmgr_psoc *psoc,
 	setup_info = &mlo_ctx->setup_info[grp_id];
 	tot_links = setup_info->tot_links;
 
-	if (reason == WMI_MLO_TEARDOWN_REASON_MODE1_SSR) {
+	if (reason == WMI_HOST_MLO_TEARDOWN_REASON_MODE1_SSR) {
 		for (link_idx = 0; link_idx < tot_links; link_idx++) {
 			umac_reset = 0;
 			temp_pdev = setup_info->pdev_list[link_idx];
@@ -1124,7 +1124,7 @@ QDF_STATUS mlo_link_teardown_link(struct wlan_objmgr_psoc *psoc,
 	/* Trigger MLO teardown */
 	mlo_send_teardown_req(psoc, grp_id, reason);
 
-	if (reason == WMI_MLO_TEARDOWN_REASON_SSR) {
+	if (reason == WMI_HOST_MLO_TEARDOWN_REASON_SSR) {
 		/* do not wait for teardown event completion here for SSR */
 		return QDF_STATUS_SUCCESS;
 	}

+ 16 - 16
wmi/inc/wmi_unified_11be_param.h

@@ -45,14 +45,14 @@ struct wmi_mlo_ready_params {
 };
 
 /** enum wmi_mlo_teardown_reason - Reason code in WMI MLO teardown command
- * @WMI_MLO_TEARDOWN_REASON_DOWN: Wifi down
- * @WMI_MLO_TEARDOWN_REASON_SSR: Wifi Recovery
- * @WMI_MLO_TEARDOWN_REASON_MODE1_SSR: Recovery Mode1 SSR teardown
+ * @WMI_HOST_MLO_TEARDOWN_REASON_DOWN: Wifi down
+ * @WMI_HOST_MLO_TEARDOWN_REASON_SSR: Wifi Recovery
+ * @WMI_HOST_MLO_TEARDOWN_REASON_MODE1_SSR: Recovery Mode1 SSR teardown
  */
 enum wmi_mlo_teardown_reason {
-	WMI_MLO_TEARDOWN_REASON_DOWN,
-	WMI_MLO_TEARDOWN_REASON_SSR,
-	WMI_MLO_TEARDOWN_REASON_MODE1_SSR,
+	WMI_HOST_MLO_TEARDOWN_REASON_DOWN,
+	WMI_HOST_MLO_TEARDOWN_REASON_SSR,
+	WMI_HOST_MLO_TEARDOWN_REASON_MODE1_SSR,
 };
 
 /** struct wmi_mlo_teardown_params - MLO teardown command params
@@ -67,12 +67,12 @@ struct wmi_mlo_teardown_params {
 };
 
 /** enum wmi_mlo_setup_status - Status code in WMI MLO setup completion event
- * @WMI_MLO_SETUP_STATUS_SUCCESS: Success
- * @WMI_MLO_SETUP_STATUS_FAILURE: Failure
+ * @WMI_HOST_MLO_SETUP_STATUS_SUCCESS: Success
+ * @WMI_HOST_MLO_SETUP_STATUS_FAILURE: Failure
  */
 enum wmi_mlo_setup_status {
-	WMI_MLO_SETUP_STATUS_SUCCESS,
-	WMI_MLO_SETUP_STATUS_FAILURE,
+	WMI_HOST_MLO_SETUP_STATUS_SUCCESS,
+	WMI_HOST_MLO_SETUP_STATUS_FAILURE,
 };
 
 /** struct wmi_mlo_setup_complete_params - MLO setup complete event params
@@ -88,14 +88,14 @@ struct wmi_mlo_setup_complete_params {
 
 /** enum wmi_mlo_teardown_status - Status code in WMI MLO teardown completion
  *                                 event
- * @WMI_MLO_TEARDOWN_STATUS_SUCCESS: Success
- * @WMI_MLO_TEARDOWN_STATUS_FAILURE: Failure
- * @WMI_MLO_TEARDOWN_STATUS_ONGOING: Ongoing
+ * @WMI_HOST_MLO_TEARDOWN_STATUS_SUCCESS: Success
+ * @WMI_HOST_MLO_TEARDOWN_STATUS_FAILURE: Failure
+ * @WMI_HOST_MLO_TEARDOWN_STATUS_ONGOING: Ongoing
  */
 enum wmi_mlo_teardown_status {
-	WMI_MLO_TEARDOWN_STATUS_SUCCESS,
-	WMI_MLO_TEARDOWN_STATUS_FAILURE,
-	WMI_MLO_TEARDOWN_STATUS_ONGOING,
+	WMI_HOST_MLO_TEARDOWN_STATUS_SUCCESS,
+	WMI_HOST_MLO_TEARDOWN_STATUS_FAILURE,
+	WMI_HOST_MLO_TEARDOWN_STATUS_ONGOING,
 };
 
 /** struct wmi_mlo_teardown_cmpl_params - MLO setup teardown event params

+ 7 - 7
wmi/src/wmi_unified_11be_tlv.c

@@ -2105,11 +2105,11 @@ QDF_STATUS mlo_teardown_cmd_send_tlv(struct wmi_unified *wmi_handle,
 								wmi_handle,
 								param->pdev_id);
 	switch (param->reason) {
-	case WMI_MLO_TEARDOWN_REASON_SSR:
-	case WMI_MLO_TEARDOWN_REASON_MODE1_SSR:
+	case WMI_HOST_MLO_TEARDOWN_REASON_SSR:
+	case WMI_HOST_MLO_TEARDOWN_REASON_MODE1_SSR:
 		cmd->reason_code = WMI_MLO_TEARDOWN_SSR_REASON;
 		break;
-	case WMI_MLO_TEARDOWN_REASON_DOWN:
+	case WMI_HOST_MLO_TEARDOWN_REASON_DOWN:
 	default:
 		cmd->reason_code = WMI_MLO_TEARDOWN_SSR_REASON + 1;
 		break;
@@ -2147,9 +2147,9 @@ extract_mlo_setup_cmpl_event_tlv(struct wmi_unified *wmi_handle,
 								wmi_handle,
 								ev->pdev_id);
 	if (!ev->status)
-		params->status = WMI_MLO_SETUP_STATUS_SUCCESS;
+		params->status = WMI_HOST_MLO_SETUP_STATUS_SUCCESS;
 	else
-		params->status = WMI_MLO_SETUP_STATUS_FAILURE;
+		params->status = WMI_HOST_MLO_SETUP_STATUS_FAILURE;
 
 	params->max_ml_peer_ids = ev->max_ml_peer_ids;
 
@@ -2175,9 +2175,9 @@ extract_mlo_teardown_cmpl_event_tlv(struct wmi_unified *wmi_handle,
 								wmi_handle,
 								ev->pdev_id);
 	if (!ev->status)
-		params->status = WMI_MLO_TEARDOWN_STATUS_SUCCESS;
+		params->status = WMI_HOST_MLO_TEARDOWN_STATUS_SUCCESS;
 	else
-		params->status = WMI_MLO_TEARDOWN_STATUS_FAILURE;
+		params->status = WMI_HOST_MLO_TEARDOWN_STATUS_FAILURE;
 
 	return QDF_STATUS_SUCCESS;
 }