From ef0d714d2292344025a3ba6c0e71c3edc26e1e2c Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Fri, 17 May 2019 17:07:47 -0700 Subject: [PATCH] qcacld-3.0: Replace SIR_MAC_BA_* with converged macros Replace SIR_MAC_BA_* with converged macros. Change-Id: Id6b32a6e6cbf07ab728fc8832879d2f2dfc85820 CRs-Fixed: 2457795 --- core/mac/inc/sir_mac_prot_def.h | 4 ---- core/mac/src/pe/lim/lim_process_action_frame.c | 4 ++-- core/mac/src/pe/lim/lim_send_management_frames.c | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/core/mac/inc/sir_mac_prot_def.h b/core/mac/inc/sir_mac_prot_def.h index 11da34fed01f..49a5ddb8b861 100644 --- a/core/mac/inc/sir_mac_prot_def.h +++ b/core/mac/inc/sir_mac_prot_def.h @@ -103,10 +103,6 @@ #define SIR_MAC_ACTION_TX 1 #define SIR_MAC_ACTION_RX 2 -#define SIR_MAC_ADDBA_REQ 0 -#define SIR_MAC_ADDBA_RSP 1 -#define SIR_MAC_DELBA_REQ 2 - #define SIR_MAC_BA_POLICY_DELAYED 0 #define SIR_MAC_BA_POLICY_IMMEDIATE 1 #define SIR_MAC_BA_AMSDU_SUPPORTED 1 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 6c7d60efdb4f..fcd6f42cbb0a 100644 --- a/core/mac/src/pe/lim/lim_process_action_frame.c +++ b/core/mac/src/pe/lim/lim_process_action_frame.c @@ -2183,10 +2183,10 @@ void lim_process_action_frame(struct mac_context *mac_ctx, pe_debug("Rcvd Block Ack for %pM; action: %d", session->selfMacAddr, action_hdr->actionID); switch (action_hdr->actionID) { - case SIR_MAC_ADDBA_REQ: + case ADDBA_REQUEST: lim_process_addba_req(mac_ctx, rx_pkt_info, session); break; - case SIR_MAC_DELBA_REQ: + case DELBA: lim_process_delba_req(mac_ctx, rx_pkt_info, session); break; default: 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 562b7827cea0..eef1e28db86f 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -4739,7 +4739,7 @@ QDF_STATUS lim_send_addba_response_frame(struct mac_context *mac_ctx, cdp_peer_release_ref(soc, peer, PEER_DEBUG_ID_LIM_SEND_ADDBA_RESP); qdf_mem_zero((uint8_t *) &frm, sizeof(frm)); frm.Category.category = ACTION_CATEGORY_BACK; - frm.Action.action = SIR_MAC_ADDBA_RSP; + frm.Action.action = ADDBA_RESPONSE; frm.DialogToken.token = dialog_token; frm.Status.status = status_code;