qcacld-3.0: Replace SIR_MAC_RRM_* with converged macros
Replace SIR_MAC_RRM_* with converged macros.
Change-Id: I2150b5818dee4e35dda51a23fc956876d88b4c5b
CRs-Fixed: 2459572
diff --git a/core/mac/inc/sir_mac_prot_def.h b/core/mac/inc/sir_mac_prot_def.h
index 3feb7a3..94ae804 100644
--- a/core/mac/inc/sir_mac_prot_def.h
+++ b/core/mac/inc/sir_mac_prot_def.h
@@ -137,14 +137,6 @@
#define SIR_MAC_RRM_LOCATION_CIVIC_TYPE 11
#define SIR_MAC_RRM_FINE_TIME_MEAS_TYPE 16
-/* RRM action codes */
-#define SIR_MAC_RRM_RADIO_MEASURE_REQ 0
-#define SIR_MAC_RRM_RADIO_MEASURE_RPT 1
-#define SIR_MAC_RRM_LINK_MEASUREMENT_REQ 2
-#define SIR_MAC_RRM_LINK_MEASUREMENT_RPT 3
-#define SIR_MAC_RRM_NEIGHBOR_REQ 4
-#define SIR_MAC_RRM_NEIGHBOR_RPT 5
-
/* VHT Action Field */
#define SIR_MAC_VHT_GID_NOTIFICATION 1
#define SIR_MAC_VHT_OPMODE_NOTIFICATION 2
diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c
index fcd6f42..b014362 100644
--- a/core/mac/src/pe/lim/lim_process_action_frame.c
+++ b/core/mac/src/pe/lim/lim_process_action_frame.c
@@ -1955,12 +1955,12 @@
mac_ctx->roam.roamSession
[session->smeSessionId].dhcp_done) {
switch (action_hdr->actionID) {
- case SIR_MAC_RRM_RADIO_MEASURE_REQ:
+ case RRM_RADIO_MEASURE_REQ:
__lim_process_radio_measure_request(mac_ctx,
(uint8_t *)rx_pkt_info,
session);
break;
- case SIR_MAC_RRM_LINK_MEASUREMENT_REQ:
+ case RRM_LINK_MEASUREMENT_REQ:
if (!lim_is_valid_frame(
&rrm_link_action_frm,
rx_pkt_info))
@@ -1975,7 +1975,7 @@
rx_pkt_info);
break;
- case SIR_MAC_RRM_NEIGHBOR_RPT:
+ case RRM_NEIGHBOR_RPT:
__lim_process_neighbor_report(mac_ctx,
(uint8_t *)rx_pkt_info,
session);
diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c
index f3533ca..ce3e3af 100644
--- a/core/mac/src/pe/lim/lim_send_management_frames.c
+++ b/core/mac/src/pe/lim/lim_send_management_frames.c
@@ -3987,7 +3987,7 @@
qdf_mem_zero((uint8_t *) &frm, sizeof(frm));
frm.Category.category = ACTION_CATEGORY_RRM;
- frm.Action.action = SIR_MAC_RRM_NEIGHBOR_REQ;
+ frm.Action.action = RRM_NEIGHBOR_REQ;
frm.DialogToken.token = pNeighborReq->dialogToken;
if (pNeighborReq->ssid_present) {
@@ -4124,7 +4124,7 @@
qdf_mem_zero((uint8_t *) &frm, sizeof(frm));
frm.Category.category = ACTION_CATEGORY_RRM;
- frm.Action.action = SIR_MAC_RRM_LINK_MEASUREMENT_RPT;
+ frm.Action.action = RRM_LINK_MEASUREMENT_RPT;
frm.DialogToken.token = pLinkReport->dialogToken;
/* IEEE Std. 802.11 7.3.2.18. for the report element. */
@@ -4266,7 +4266,7 @@
dialog_token, num_report, is_last_frame);
frm->Category.category = ACTION_CATEGORY_RRM;
- frm->Action.action = SIR_MAC_RRM_RADIO_MEASURE_RPT;
+ frm->Action.action = RRM_RADIO_MEASURE_RPT;
frm->DialogToken.token = dialog_token;
frm->num_MeasurementReport =