Commit 68a3a849 authored by Guido Casati's avatar Guido Casati

refactor: Use centralized get_sdap_Config in nr_reconfigure_sdap_entity

Replace inline parameter extraction with get_sdap_Config() function call to:
- Eliminate code duplication in SDAP configuration handling
- Streamline QFI release processing with structured config object
- Ensure consistent SDAP configuration extraction across all SDAP operations
parent 35026346
...@@ -704,26 +704,19 @@ void nr_reconfigure_sdap_entity(NR_SDAP_Config_t *sdap_config, ue_id_t ue_id, in ...@@ -704,26 +704,19 @@ void nr_reconfigure_sdap_entity(NR_SDAP_Config_t *sdap_config, ue_id_t ue_id, in
ue_id, ue_id,
pdusession_id); pdusession_id);
/* QFI to DRB mapping */ /* QFI to DRB mapping */
NR_QFI_t *mappedQFIs2Add = (NR_QFI_t *)sdap_config->mappedQoS_FlowsToAdd->list.array[0]; sdap_config_t sdap = get_sdap_Config(is_gnb, sdap_config, drb_id);
uint8_t mappedQFIs2AddCount = sdap_config->mappedQoS_FlowsToAdd->list.count;
bool has_sdap_rx = is_sdap_rx(is_gnb, sdap_config);
bool has_sdap_tx = is_sdap_tx(is_gnb, sdap_config);
nr_sdap_ue_qfi2drb_config(sdap_entity, nr_sdap_ue_qfi2drb_config(sdap_entity,
sdap_entity->default_drb, sdap_entity->default_drb,
ue_id, ue_id,
mappedQFIs2Add, sdap.mappedQFIs2Add,
mappedQFIs2AddCount, sdap.mappedQFIs2AddCount,
drb_id, drb_id,
has_sdap_rx, sdap.sdap_rx,
has_sdap_tx); sdap.sdap_tx);
/* handle QFIs to DRB mapping rule to release */ /* handle QFIs to DRB mapping rule to release */
if (sdap_config->mappedQoS_FlowsToRelease) { for (int i = 0; i < sdap.mappedQFIs2ReleaseCount; i++) {
NR_QFI_t *mappedQFIs2release = (NR_QFI_t *)sdap_config->mappedQoS_FlowsToRelease->list.array[0]; uint8_t qfi = sdap.mappedQFIs2Release[i];
uint8_t mappedQFIs2RemoveCount = sdap_config->mappedQoS_FlowsToRelease->list.count; sdap_entity->qfi2drb_map_delete(sdap_entity, qfi);
for(int i = 0; i < mappedQFIs2RemoveCount; i++){
uint8_t qfi = mappedQFIs2release[i];
sdap_entity->qfi2drb_map_delete(sdap_entity, qfi);
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment