qcacld-3.0: Replace SIR_MAC_ACTION_* with converged enum ACTION_SPCT_*

Replace SIR_MAC_ACTION_* with converged enum ACTION_SPCT_*.

Change-Id: I76cc3d7ea8e12b9a40f39ba855a73e2779896fea
CRs-Fixed: 2460915

components/pmo/dispatcher/inc/wlan_pmo_wow_public_struct.h

@@ -66,8 +66,6 @@
 #define PMO_MAC_ACTION_VHT            21
 #define PMO_MAC_ACTION_MAX            256
 
-#define PMO_MAC_ACTION_MEASURE_REQUEST_ID      0
-#define PMO_MAC_ACTION_TPC_REQUEST_ID          2
 /*
  * ALLOWED_ACTION_FRAMES_BITMAP
  *
@@ -135,13 +133,13 @@
  * ----------------------------------+-----+------+
  *         Type                      | Bit | Drop |
  * ----------------------------------+-----+------+
- * SIR_MAC_ACTION_MEASURE_REQUEST_ID    0     1
- * SIR_MAC_ACTION_TPC_REQUEST_ID        2     1
+ * ACTION_SPCT_MSR_REQ                  0     1
+ * ACTION_SPCT_TPC_REQ                  2     1
  * ----------------------------------+-----+------+
  */
 #define DROP_SPEC_MGMT_ACTION_FRAME_BITMAP \
-		((1 << PMO_MAC_ACTION_MEASURE_REQUEST_ID) |\
-		 (1 << PMO_MAC_ACTION_TPC_REQUEST_ID))
+		((1 << ACTION_SPCT_MSR_REQ) |\
+		 (1 << ACTION_SPCT_TPC_REQ))
 #else
 /*
  * If 11H support is defined, dont drop the above action category of

core/mac/inc/sir_mac_prot_def.h

@@ -110,14 +110,6 @@
 
 #define MAX_BA_BUFF_SIZE    256
 
-#ifdef ANI_SUPPORT_11H
-#define SIR_MAC_ACTION_MEASURE_REQUEST_ID      0
-#define SIR_MAC_ACTION_MEASURE_REPORT_ID       1
-#define SIR_MAC_ACTION_TPC_REQUEST_ID          2
-#define SIR_MAC_ACTION_TPC_REPORT_ID           3
-#endif /* ANI_SUPPORT_11H */
-#define SIR_MAC_ACTION_CHANNEL_SWITCH_ID       4
-
 #ifdef ANI_SUPPORT_11H
 #define SIR_MAC_BASIC_MEASUREMENT_TYPE         0
 #define SIR_MAC_CCA_MEASUREMENT_TYPE           1

core/mac/src/pe/lim/lim_process_action_frame.c

@@ -1846,13 +1846,13 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
 	case ACTION_CATEGORY_SPECTRUM_MGMT:
 		switch (action_hdr->actionID) {
 #ifdef ANI_SUPPORT_11H
-		case SIR_MAC_ACTION_MEASURE_REQUEST_ID:
+		case ACTION_SPCT_MSR_REQ:
 			if (session->lim11hEnable)
 				__lim_process_measurement_request_frame(mac_ctx,
 							rx_pkt_info,
 							session);
 			break;
-		case SIR_MAC_ACTION_TPC_REQUEST_ID:
+		case ACTION_SPCT_TPC_REQ:
 			if ((LIM_IS_STA_ROLE(session) ||
 				LIM_IS_AP_ROLE(session)) &&
 				session->lim11hEnable)
@@ -1860,7 +1860,7 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
 						rx_pkt_info, session);
 			break;
 #endif
-		case SIR_MAC_ACTION_CHANNEL_SWITCH_ID:
+		case ACTION_SPCT_CHL_SWITCH:
 			if (LIM_IS_STA_ROLE(session))
 				__lim_process_channel_switch_action_frame(
 					mac_ctx, rx_pkt_info, session);

core/mac/src/pe/lim/lim_send_management_frames.c

@@ -3320,7 +3320,7 @@ lim_send_meas_report_frame(struct mac_context *mac,
 	qdf_mem_zero((uint8_t *) &frm, sizeof(frm));
 
 	frm.Category.category = ACTION_CATEGORY_SPECTRUM_MGMT;
-	frm.Action.action = SIR_MAC_ACTION_MEASURE_REPORT_ID;
+	frm.Action.action = ACTION_SPCT_MSR_RPRT;
 	frm.DialogToken.token = pMeasReqFrame->actionHeader.dialogToken;
 
 	switch (pMeasReqFrame->measReqIE.measType) {
@@ -3446,7 +3446,7 @@ lim_send_tpc_report_frame(struct mac_context *mac,
 	qdf_mem_zero((uint8_t *) &frm, sizeof(frm));
 
 	frm.Category.category = ACTION_CATEGORY_SPECTRUM_MGMT;
-	frm.Action.action = SIR_MAC_ACTION_TPC_REPORT_ID;
+	frm.Action.action = ACTION_SPCT_TPC_RPRT;
 	frm.DialogToken.token = pTpcReqFrame->actionHeader.dialogToken;
 
 	frm.TPCReport.tx_power = 0;
@@ -3568,7 +3568,7 @@ lim_send_channel_switch_mgmt_frame(struct mac_context *mac,
 	qdf_mem_zero((uint8_t *) &frm, sizeof(frm));
 
 	frm.Category.category = ACTION_CATEGORY_SPECTRUM_MGMT;
-	frm.Action.action = SIR_MAC_ACTION_CHANNEL_SWITCH_ID;
+	frm.Action.action = ACTION_SPCT_CHL_SWITCH;
 	frm.ChanSwitchAnn.switchMode = nMode;
 	frm.ChanSwitchAnn.newChannel = nNewChannel;
 	frm.ChanSwitchAnn.switchCount = nCount;