diff --git a/core/mac/inc/sir_mac_prot_def.h b/core/mac/inc/sir_mac_prot_def.h index 676ad2812ba2b..11da34fed01f2 100644 --- a/core/mac/inc/sir_mac_prot_def.h +++ b/core/mac/inc/sir_mac_prot_def.h @@ -103,17 +103,6 @@ #define SIR_MAC_ACTION_TX 1 #define SIR_MAC_ACTION_RX 2 -/* QoS management action codes */ - -#define SIR_MAC_QOS_ADD_TS_REQ 0 -#define SIR_MAC_QOS_ADD_TS_RSP 1 -#define SIR_MAC_QOS_DEL_TS_REQ 2 -#define SIR_MAC_QOS_SCHEDULE 3 -#define SIR_MAC_QOS_MAP_CONFIGURE 4 -/* and these are proprietary */ -#define SIR_MAC_QOS_DEF_BA_REQ 4 -#define SIR_MAC_QOS_DEF_BA_RSP 5 - #define SIR_MAC_ADDBA_REQ 0 #define SIR_MAC_ADDBA_RSP 1 #define SIR_MAC_DELBA_REQ 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 a0d7855898650..6c7d60efdb4fd 100644 --- a/core/mac/src/pe/lim/lim_process_action_frame.c +++ b/core/mac/src/pe/lim/lim_process_action_frame.c @@ -1809,27 +1809,27 @@ void lim_process_action_frame(struct mac_context *mac_ctx, switch (action_hdr->category) { case ACTION_CATEGORY_QOS: if ((session->limQosEnabled) || - (action_hdr->actionID == SIR_MAC_QOS_MAP_CONFIGURE)) { + (action_hdr->actionID == QOS_MAP_CONFIGURE)) { switch (action_hdr->actionID) { - case SIR_MAC_QOS_ADD_TS_REQ: + case QOS_ADD_TS_REQ: __lim_process_add_ts_req(mac_ctx, (uint8_t *) rx_pkt_info, session); break; - case SIR_MAC_QOS_ADD_TS_RSP: + case QOS_ADD_TS_RSP: __lim_process_add_ts_rsp(mac_ctx, (uint8_t *) rx_pkt_info, session); break; - case SIR_MAC_QOS_DEL_TS_REQ: + case QOS_DEL_TS_REQ: __lim_process_del_ts_req(mac_ctx, (uint8_t *) rx_pkt_info, session); break; - case SIR_MAC_QOS_MAP_CONFIGURE: + case QOS_MAP_CONFIGURE: __lim_process_qos_map_configure_frame(mac_ctx, (uint8_t *)rx_pkt_info, session); @@ -1879,22 +1879,22 @@ void lim_process_action_frame(struct mac_context *mac_ctx, break; } switch (action_hdr->actionID) { - case SIR_MAC_QOS_ADD_TS_REQ: + case QOS_ADD_TS_REQ: __lim_process_add_ts_req(mac_ctx, (uint8_t *) rx_pkt_info, session); break; - case SIR_MAC_QOS_ADD_TS_RSP: + case QOS_ADD_TS_RSP: __lim_process_add_ts_rsp(mac_ctx, (uint8_t *) rx_pkt_info, session); break; - case SIR_MAC_QOS_DEL_TS_REQ: + case QOS_DEL_TS_REQ: __lim_process_del_ts_req(mac_ctx, (uint8_t *) rx_pkt_info, session); break; - case SIR_MAC_QOS_MAP_CONFIGURE: + case QOS_MAP_CONFIGURE: __lim_process_qos_map_configure_frame(mac_ctx, (uint8_t *)rx_pkt_info, session); break; 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 2062c4d2bd565..562b7827cea07 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -839,7 +839,7 @@ lim_send_addts_req_action_frame(struct mac_context *mac, if (!pAddTS->wmeTspecPresent) { qdf_mem_zero((uint8_t *) &AddTSReq, sizeof(AddTSReq)); - AddTSReq.Action.action = SIR_MAC_QOS_ADD_TS_REQ; + AddTSReq.Action.action = QOS_ADD_TS_REQ; AddTSReq.DialogToken.token = pAddTS->dialogToken; AddTSReq.Category.category = ACTION_CATEGORY_QOS; if (pAddTS->lleTspecPresent) { @@ -893,7 +893,7 @@ lim_send_addts_req_action_frame(struct mac_context *mac, } else { qdf_mem_zero((uint8_t *) &WMMAddTSReq, sizeof(WMMAddTSReq)); - WMMAddTSReq.Action.action = SIR_MAC_QOS_ADD_TS_REQ; + WMMAddTSReq.Action.action = QOS_ADD_TS_REQ; WMMAddTSReq.DialogToken.token = pAddTS->dialogToken; WMMAddTSReq.Category.category = ACTION_CATEGORY_WMM; @@ -1404,7 +1404,7 @@ lim_send_delts_req_action_frame(struct mac_context *mac, qdf_mem_zero((uint8_t *) &DelTS, sizeof(DelTS)); DelTS.Category.category = ACTION_CATEGORY_QOS; - DelTS.Action.action = SIR_MAC_QOS_DEL_TS_REQ; + DelTS.Action.action = QOS_DEL_TS_REQ; populate_dot11f_ts_info(pTsinfo, &DelTS.TSInfo); nStatus = dot11f_get_packed_del_ts_size(mac, &DelTS, &nPayload); @@ -1421,7 +1421,7 @@ lim_send_delts_req_action_frame(struct mac_context *mac, qdf_mem_zero((uint8_t *) &WMMDelTS, sizeof(WMMDelTS)); WMMDelTS.Category.category = ACTION_CATEGORY_WMM; - WMMDelTS.Action.action = SIR_MAC_QOS_DEL_TS_REQ; + WMMDelTS.Action.action = QOS_DEL_TS_REQ; WMMDelTS.DialogToken.token = 0; WMMDelTS.StatusCode.statusCode = 0; populate_dot11f_wmmtspec(pTspecIe, &WMMDelTS.WMMTSPEC); diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index 02bf7cb7d1fbc..52d3a7957b483 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -4460,7 +4460,7 @@ sir_convert_addts_rsp2_struct(struct mac_context *mac, uint16_t i; uint32_t status; - if (SIR_MAC_QOS_ADD_TS_RSP != *(pFrame + 1)) { + if (QOS_ADD_TS_RSP != *(pFrame + 1)) { pe_err("Action of %d; this is not supported & is probably an error", *(pFrame + 1)); return QDF_STATUS_E_FAILURE; @@ -4626,7 +4626,7 @@ sir_convert_delts_req2_struct(struct mac_context *mac, tDot11fWMMDelTS wmmdelts = { {0} }; uint32_t status; - if (SIR_MAC_QOS_DEL_TS_REQ != *(pFrame + 1)) { + if (QOS_DEL_TS_REQ != *(pFrame + 1)) { pe_err("sirConvertDeltsRsp2Struct invoked " "with an Action of %d; this is not " "supported & is probably an error",