Revert "qcacld-3.0: Fix No AMSDU/MPDU aggregation issue"

This reverts commit I0c86e74f6447f401d24660e1291abf969b1abbe6.

Change-Id: I31bea28044fbec4911f42a38be1b1b6679dd6dda
CRs-Fixed: 2963188

core/wma/src/wma_features.c

@@ -4100,12 +4100,9 @@ QDF_STATUS wma_set_tx_rx_aggr_size(uint8_t vdev_id,
 	/* bit 2 (aggr_type): TX Aggregation Type (0=A-MPDU, 1=A-MSDU) */
 	if (aggr_type == WMI_VDEV_CUSTOM_AGGR_TYPE_AMSDU)
 		cmd->enable_bitmap |= 0x04;
-	/* Set bit3(tx_aggr_size_disable) if tx_aggr_size is invalid */
-	if (tx_size == 0)
-		cmd->enable_bitmap |= (0x1 << 3);
-	/* Set bit4(rx_aggr_size_disable) if rx_aggr_size is invalid */
+	/* bit 3 (tx_aggr_size_disable):  If set tx_aggr_size is invalid */
 	if (rx_size == 0)
-		cmd->enable_bitmap |= (0x1 << 4);
+		cmd->enable_bitmap |= (0x1 << 3);
 
 	cmd->enable_bitmap |= (0x1 << 6);
 
@@ -4167,7 +4164,8 @@ QDF_STATUS wma_set_tx_rx_aggr_size_per_ac(WMA_HANDLE handle,
 		cmd->rx_aggr_size = qos_aggr->rx_aggregation_size;
 		cmd->tx_aggr_size = tx_aggr_size[queue_num];
 		/* bit 5: tx_ac_enable, if set, ac bitmap is valid. */
-		cmd->enable_bitmap = 0x20 | queue_num;
+		if (cmd->rx_aggr_size != 0)
+			cmd->enable_bitmap = 0x20 | queue_num;
 		/* bit 2 (aggr_type): TX Aggregation Type (0=A-MPDU, 1=A-MSDU) */
 		if (aggr_type == WMI_VDEV_CUSTOM_AGGR_TYPE_AMSDU)
 			cmd->enable_bitmap |= 0x04;