diff --git a/components/mlme/core/src/wlan_mlme_main.c b/components/mlme/core/src/wlan_mlme_main.c index 0fe090ae09af..723c7a54a918 100644 --- a/components/mlme/core/src/wlan_mlme_main.c +++ b/components/mlme/core/src/wlan_mlme_main.c @@ -794,8 +794,6 @@ static void mlme_init_qos_cfg(struct wlan_objmgr_psoc *psoc, cfg_get(psoc, CFG_SAP_MAX_INACTIVITY_OVERRIDE); qos_aggr_params->sap_uapsd_enabled = cfg_get(psoc, CFG_SAP_QOS_UAPSD); - qos_aggr_params->reject_addba_req = - cfg_get(psoc, CFG_REJECT_ADDBA_REQ); } static void mlme_init_mbo_cfg(struct wlan_objmgr_psoc *psoc, diff --git a/components/mlme/dispatcher/inc/cfg_qos.h b/components/mlme/dispatcher/inc/cfg_qos.h index ccff899c62fe..7e784f688208 100644 --- a/components/mlme/dispatcher/inc/cfg_qos.h +++ b/components/mlme/dispatcher/inc/cfg_qos.h @@ -192,27 +192,6 @@ CFG_VALUE_OR_DEFAULT, \ "Rx Aggregation size value") -/* - * - * reject_addba_req - Configure Rx ADDBA Req reject for PEER AP - * @Min: 0 - * @Max: 1 - * @Default: 0 - * - * reject_addba_req gives an option to reject ADDBA Req from PEER AP - * - * Related: None - * - * Supported Feature: STA - * - * Usage: External - * - * - */ -#define CFG_REJECT_ADDBA_REQ CFG_INI_BOOL( \ - "reject_addba_req", \ - 0, \ - "Addba Req Reject") /* * * gTxAggSwRetryBE - Configure Tx aggregation sw retry for BE @@ -537,7 +516,6 @@ CFG(CFG_TX_NON_AGGR_SW_RETRY_VI) \ CFG(CFG_TX_NON_AGGR_SW_RETRY_VO) \ CFG(CFG_TX_NON_AGGR_SW_RETRY) \ - CFG(CFG_SAP_QOS_UAPSD) \ - CFG(CFG_REJECT_ADDBA_REQ) + CFG(CFG_SAP_QOS_UAPSD) #endif /* __CFG_MLME_QOS_H */ diff --git a/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h b/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h index 75a620d2a0bc..4e18ef9a9db7 100644 --- a/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h +++ b/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h @@ -935,7 +935,6 @@ struct wlan_mlme_vht_caps { * @sap_max_inactivity_override: Override updating ap_sta_inactivity from * hostapd.conf * @sap_uapsd_enabled: Flag to enable/disable UAPSD for SAP - * @reject_addba_req: Flag to decline ADDBA Req from SAP */ struct wlan_mlme_qos { uint32_t tx_aggregation_size; @@ -956,7 +955,6 @@ struct wlan_mlme_qos { uint32_t tx_non_aggr_sw_retry_threshold; bool sap_max_inactivity_override; bool sap_uapsd_enabled; - bool reject_addba_req; }; #ifdef WLAN_FEATURE_11AX diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h index 77d54779981d..38c9b3dc6233 100644 --- a/core/mac/inc/ani_global.h +++ b/core/mac/inc/ani_global.h @@ -789,6 +789,7 @@ struct mac_context { uint32_t rx_mc_bc_cnt; /* 11k Offload Support */ bool is_11k_offload_supported; + uint8_t reject_addba_req; bool usr_cfg_ps_enable; uint16_t usr_cfg_ba_buff_size; bool is_usr_cfg_amsdu_enabled; diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 1c78bf521c5e..073dc9dec21d 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -3773,9 +3773,9 @@ static void lim_process_sme_set_addba_accept(struct mac_context *mac_ctx, return; } if (!msg->addba_accept) - mac_ctx->mlme_cfg->qos_mlme_params.reject_addba_req = 1; + mac_ctx->reject_addba_req = 1; else - mac_ctx->mlme_cfg->qos_mlme_params.reject_addba_req = 0; + mac_ctx->reject_addba_req = 0; } static void lim_process_sme_update_edca_params(struct mac_context *mac_ctx, 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 b6b1b09f8583..f62b83d4a40a 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -5337,22 +5337,20 @@ QDF_STATUS lim_send_addba_response_frame(struct mac_context *mac_ctx, tpDphHashNode sta_ds; uint16_t aid; bool he_cap = false; - struct wlan_mlme_qos *qos_aggr; vdev_id = session->vdev_id; cdp_addba_responsesetup(soc, peer_mac, vdev_id, tid, &dialog_token, &status_code, &buff_size, &batimeout); - qos_aggr = &mac_ctx->mlme_cfg->qos_mlme_params; + qdf_mem_zero((uint8_t *) &frm, sizeof(frm)); frm.Category.category = ACTION_CATEGORY_BACK; frm.Action.action = ADDBA_RESPONSE; frm.DialogToken.token = dialog_token; frm.Status.status = status_code; - - if (qos_aggr->reject_addba_req) { + if (mac_ctx->reject_addba_req) { frm.Status.status = STATUS_REQUEST_DECLINED; pe_err("refused addba req"); }