lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Replace SIR_MAC_QOS_* with converged QOS macros

Browse Source 
Replace SIR_MAC_QOS_* with converged QOS macros.

Change-Id: I669b83495b4f78398200135c41cd67867fb2fc3d
CRs-Fixed: 2457795
This commit is contained in:
Srinivas Girigowda 2019-05-17 16:50:31 -07:00 committed by nshrivas
parent 48bec1c925
commit 03cebc3fdf
4 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/mac/inc/sir_mac_prot_def.h
View File

@ -103,17 +103,6 @@
#define SIR_MAC_ACTION_TX 1 #define SIR_MAC_ACTION_TX 1
#define SIR_MAC_ACTION_RX 2 #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_REQ 0
#define SIR_MAC_ADDBA_RSP 1 #define SIR_MAC_ADDBA_RSP 1
#define SIR_MAC_DELBA_REQ 2 #define SIR_MAC_DELBA_REQ 2

18
core/mac/src/pe/lim/lim_process_action_frame.c
View File

@ -1809,27 +1809,27 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
switch (action_hdr->category) { switch (action_hdr->category) {
case ACTION_CATEGORY_QOS: case ACTION_CATEGORY_QOS:
if ((session->limQosEnabled) || if ((session->limQosEnabled) ||
(action_hdr->actionID == SIR_MAC_QOS_MAP_CONFIGURE)) { (action_hdr->actionID == QOS_MAP_CONFIGURE)) {
switch (action_hdr->actionID) { switch (action_hdr->actionID) {
case SIR_MAC_QOS_ADD_TS_REQ: case QOS_ADD_TS_REQ:
__lim_process_add_ts_req(mac_ctx, __lim_process_add_ts_req(mac_ctx,
(uint8_t *) rx_pkt_info, (uint8_t *) rx_pkt_info,
session); session);
break; break;
case SIR_MAC_QOS_ADD_TS_RSP: case QOS_ADD_TS_RSP:
__lim_process_add_ts_rsp(mac_ctx, __lim_process_add_ts_rsp(mac_ctx,
(uint8_t *) rx_pkt_info, (uint8_t *) rx_pkt_info,
session); session);
break; break;
case SIR_MAC_QOS_DEL_TS_REQ: case QOS_DEL_TS_REQ:
__lim_process_del_ts_req(mac_ctx, __lim_process_del_ts_req(mac_ctx,
(uint8_t *) rx_pkt_info, (uint8_t *) rx_pkt_info,
session); session);
break; break;
case SIR_MAC_QOS_MAP_CONFIGURE: case QOS_MAP_CONFIGURE:
__lim_process_qos_map_configure_frame(mac_ctx, __lim_process_qos_map_configure_frame(mac_ctx,
(uint8_t *)rx_pkt_info, (uint8_t *)rx_pkt_info,
session); session);
@ -1879,22 +1879,22 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
break; break;
} }
switch (action_hdr->actionID) { switch (action_hdr->actionID) {
case SIR_MAC_QOS_ADD_TS_REQ: case QOS_ADD_TS_REQ:
__lim_process_add_ts_req(mac_ctx, __lim_process_add_ts_req(mac_ctx,
(uint8_t *) rx_pkt_info, session); (uint8_t *) rx_pkt_info, session);
break; break;
case SIR_MAC_QOS_ADD_TS_RSP: case QOS_ADD_TS_RSP:
__lim_process_add_ts_rsp(mac_ctx, __lim_process_add_ts_rsp(mac_ctx,
(uint8_t *) rx_pkt_info, session); (uint8_t *) rx_pkt_info, session);
break; break;
case SIR_MAC_QOS_DEL_TS_REQ: case QOS_DEL_TS_REQ:
__lim_process_del_ts_req(mac_ctx, __lim_process_del_ts_req(mac_ctx,
(uint8_t *) rx_pkt_info, session); (uint8_t *) rx_pkt_info, session);
break; break;
case SIR_MAC_QOS_MAP_CONFIGURE: case QOS_MAP_CONFIGURE:
__lim_process_qos_map_configure_frame(mac_ctx, __lim_process_qos_map_configure_frame(mac_ctx,
(uint8_t *)rx_pkt_info, session); (uint8_t *)rx_pkt_info, session);
break; break;

8
core/mac/src/pe/lim/lim_send_management_frames.c
View File

@ -839,7 +839,7 @@ lim_send_addts_req_action_frame(struct mac_context *mac,
if (!pAddTS->wmeTspecPresent) { if (!pAddTS->wmeTspecPresent) {
qdf_mem_zero((uint8_t *) &AddTSReq, sizeof(AddTSReq)); 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.DialogToken.token = pAddTS->dialogToken;
AddTSReq.Category.category = ACTION_CATEGORY_QOS; AddTSReq.Category.category = ACTION_CATEGORY_QOS;
if (pAddTS->lleTspecPresent) { if (pAddTS->lleTspecPresent) {
@ -893,7 +893,7 @@ lim_send_addts_req_action_frame(struct mac_context *mac,
} else { } else {
qdf_mem_zero((uint8_t *) &WMMAddTSReq, sizeof(WMMAddTSReq)); 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.DialogToken.token = pAddTS->dialogToken;
WMMAddTSReq.Category.category = ACTION_CATEGORY_WMM; 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)); qdf_mem_zero((uint8_t *) &DelTS, sizeof(DelTS));
DelTS.Category.category = ACTION_CATEGORY_QOS; 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); populate_dot11f_ts_info(pTsinfo, &DelTS.TSInfo);
nStatus = dot11f_get_packed_del_ts_size(mac, &DelTS, &nPayload); 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)); qdf_mem_zero((uint8_t *) &WMMDelTS, sizeof(WMMDelTS));
WMMDelTS.Category.category = ACTION_CATEGORY_WMM; 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.DialogToken.token = 0;
WMMDelTS.StatusCode.statusCode = 0; WMMDelTS.StatusCode.statusCode = 0;
populate_dot11f_wmmtspec(pTspecIe, &WMMDelTS.WMMTSPEC); populate_dot11f_wmmtspec(pTspecIe, &WMMDelTS.WMMTSPEC);

4
core/mac/src/sys/legacy/src/utils/src/parser_api.c
View File

@ -4460,7 +4460,7 @@ sir_convert_addts_rsp2_struct(struct mac_context *mac,
uint16_t i; uint16_t i;
uint32_t status; 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", pe_err("Action of %d; this is not supported & is probably an error",
*(pFrame + 1)); *(pFrame + 1));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
@ -4626,7 +4626,7 @@ sir_convert_delts_req2_struct(struct mac_context *mac,
tDot11fWMMDelTS wmmdelts = { {0} }; tDot11fWMMDelTS wmmdelts = { {0} };
uint32_t status; uint32_t status;
if (SIR_MAC_QOS_DEL_TS_REQ != *(pFrame + 1)) { if (QOS_DEL_TS_REQ != *(pFrame + 1)) {
pe_err("sirConvertDeltsRsp2Struct invoked " pe_err("sirConvertDeltsRsp2Struct invoked "
"with an Action of %d; this is not " "with an Action of %d; this is not "
"supported & is probably an error", "supported & is probably an error",