qcacld-3.0: update ini configured rx aggregation size in addba response

Currently addba response is not updated with ini configured rx aggregation
size.
This change is to reject peer addba request if rx aggr size is 1 and
for other sizes select min value of peer and configured sizes.

Change-Id: Ia375b1e031dfecf948429e0baea19faa8fe42ffa
CRs-Fixed: 2962314

components/mlme/dispatcher/inc/cfg_qos.h

@@ -170,7 +170,7 @@
  * gRxAggregationSize - Gives an option to configure Rx aggregation size
  * in no of MPDUs
  * @Min: 1
- * @Max: 64
+ * @Max: 256
  * @Default: 64
  *
  * gRxAggregationSize gives an option to configure Rx aggregation size
@@ -187,7 +187,7 @@
 #define CFG_RX_AGGREGATION_SIZE CFG_INI_UINT( \
 			"gRxAggregationSize", \
 			1, \
-			64, \
+			256, \
 			64, \
 			CFG_VALUE_OR_DEFAULT, \
 			"Rx Aggregation size value")

core/mac/src/pe/lim/lim_send_management_frames.c

@@ -5400,9 +5400,10 @@ QDF_STATUS lim_send_addba_response_frame(struct mac_context *mac_ctx,
 	uint8_t dialog_token;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	uint8_t he_frag = 0;
-	tpDphHashNode sta_ds;
+	tpDphHashNode sta_ds = NULL;
 	uint16_t aid;
 	bool he_cap = false;
+	struct wlan_mlme_qos *qos_aggr;
 
 	vdev_id = session->vdev_id;
 
@@ -5410,50 +5411,59 @@ QDF_STATUS lim_send_addba_response_frame(struct mac_context *mac_ctx,
 				&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 (mac_ctx->reject_addba_req) {
-		frm.Status.status = STATUS_REQUEST_DECLINED;
-		pe_err("refused addba req");
-	}
-	frm.addba_param_set.tid = tid;
 
-	sta_ds = dph_lookup_hash_entry(mac_ctx, peer_mac, &aid,
-				       &session->dph.dphHashTable);
-	if (sta_ds && lim_is_session_he_capable(session))
-		he_cap = lim_is_sta_he_capable(sta_ds);
-
-	if (sta_ds && sta_ds->staType == STA_ENTRY_NDI_PEER)
-		frm.addba_param_set.buff_size = calc_buff_size;
-	else if (he_cap)
-		frm.addba_param_set.buff_size = MAX_BA_BUFF_SIZE;
-	else
-		frm.addba_param_set.buff_size = SIR_MAC_BA_DEFAULT_BUFF_SIZE;
+	if ((LIM_IS_STA_ROLE(session) && qos_aggr->rx_aggregation_size == 1 &&
+	    !mac_ctx->usr_cfg_ba_buff_size) || mac_ctx->reject_addba_req) {
+		frm.Status.status = STATUS_REQUEST_DECLINED;
+		pe_err("refused addba req for rx_aggregation_size: %d mac_ctx->reject_addba_req: %d",
+		       qos_aggr->rx_aggregation_size, mac_ctx->reject_addba_req);
+	} else if (LIM_IS_STA_ROLE(session) && !mac_ctx->usr_cfg_ba_buff_size) {
+		frm.addba_param_set.buff_size =
+			QDF_MIN(qos_aggr->rx_aggregation_size, calc_buff_size);
+	} else {
+		sta_ds = dph_lookup_hash_entry(mac_ctx, peer_mac, &aid,
+					       &session->dph.dphHashTable);
+		if (sta_ds && lim_is_session_he_capable(session))
+			he_cap = lim_is_sta_he_capable(sta_ds);
+
+		if (sta_ds && sta_ds->staType == STA_ENTRY_NDI_PEER)
+			frm.addba_param_set.buff_size = calc_buff_size;
+		else if (he_cap)
+			frm.addba_param_set.buff_size = MAX_BA_BUFF_SIZE;
+		else
+			frm.addba_param_set.buff_size =
+					SIR_MAC_BA_DEFAULT_BUFF_SIZE;
 
-	if (mac_ctx->usr_cfg_ba_buff_size)
-		frm.addba_param_set.buff_size = mac_ctx->usr_cfg_ba_buff_size;
+		if (mac_ctx->usr_cfg_ba_buff_size)
+			frm.addba_param_set.buff_size =
+					mac_ctx->usr_cfg_ba_buff_size;
 
-	if (frm.addba_param_set.buff_size > MAX_BA_BUFF_SIZE)
-		frm.addba_param_set.buff_size = MAX_BA_BUFF_SIZE;
+		if (frm.addba_param_set.buff_size > MAX_BA_BUFF_SIZE)
+			frm.addba_param_set.buff_size = MAX_BA_BUFF_SIZE;
 
-	if (frm.addba_param_set.buff_size > SIR_MAC_BA_DEFAULT_BUFF_SIZE) {
-		if (session->active_ba_64_session) {
-			frm.addba_param_set.buff_size =
-				SIR_MAC_BA_DEFAULT_BUFF_SIZE;
+		if (frm.addba_param_set.buff_size > SIR_MAC_BA_DEFAULT_BUFF_SIZE) {
+			if (session->active_ba_64_session) {
+				frm.addba_param_set.buff_size =
+					SIR_MAC_BA_DEFAULT_BUFF_SIZE;
+			}
+		} else if (!session->active_ba_64_session) {
+			session->active_ba_64_session = true;
+		}
+		if (buff_size && (frm.addba_param_set.buff_size > buff_size)) {
+			pe_debug("buff size: %d larger than peer's capability: %d",
+				 frm.addba_param_set.buff_size, buff_size);
+			frm.addba_param_set.buff_size = buff_size;
 		}
-	} else if (!session->active_ba_64_session) {
-		session->active_ba_64_session = true;
-	}
-	if (buff_size && (frm.addba_param_set.buff_size > buff_size)) {
-		pe_debug("buff size: %d larger than peer's capability: %d",
-			 frm.addba_param_set.buff_size, buff_size);
-		frm.addba_param_set.buff_size = buff_size;
 	}
 
+	frm.addba_param_set.tid = tid;
 	/* Enable RX AMSDU only in HE mode if supported */
 	if (mac_ctx->is_usr_cfg_amsdu_enabled &&
 	    ((IS_PE_SESSION_HE_MODE(session) &&