maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NR_UE: Assure correct padding in nr_ue_get_sdu()

Browse Source 
In case no MAC CE needs to be transmitted and we filled the buffer with SDUs from RLC, we missed to add padding for the last 3 bytes.
This commit is contained in:
Thomas Schlichter
2021-08-05 12:33:09 +02:00
parent 92fb370258
commit 6c227f4d6b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+4 -3
View File
@@ -1976,7 +1976,7 @@ uint8_t nr_ue_get_sdu(module_id_t module_idP,
for (lcid = UL_SCH_LCID_SRB1;
lcid < MAX_LCID; lcid++) {
buflen_remain = buflen - (total_mac_pdu_header_len + sdu_length_total + MAX_RLC_SDU_SUBHEADER_SIZE);
buflen_remain = buflen - (total_mac_pdu_header_len + sdu_length_total + sh_size);
LOG_D(NR_MAC, "In %s: [UE %d] [%d.%d] UL-DXCH -> ULSCH, RLC with LCID 0x%02x (TBS %d bytes, sdu_length_total %d bytes, MAC header len %d bytes, buflen_remain %d bytes)\n",
__FUNCTION__,
@@ -2047,7 +2047,7 @@ uint8_t nr_ue_get_sdu(module_id_t module_idP,
break;
}
buflen_remain = buflen - (total_mac_pdu_header_len + sdu_length_total + MAX_RLC_SDU_SUBHEADER_SIZE);
buflen_remain = buflen - (total_mac_pdu_header_len + sdu_length_total + sh_size);
}
}
@@ -2056,7 +2056,6 @@ uint8_t nr_ue_get_sdu(module_id_t module_idP,
LOG_D(NR_MAC, "In %s copying %d bytes of MAC CEs to the UL PDU \n", __FUNCTION__, tot_mac_ce_len);
memcpy((void *) pdu, (void *) mac_header_control_elements, tot_mac_ce_len);
buflen_remain = buflen - (total_mac_pdu_header_len + sdu_length_total);
pdu += (unsigned char) tot_mac_ce_len;
#ifdef ENABLE_MAC_PAYLOAD_DEBUG
@@ -2066,6 +2065,8 @@ uint8_t nr_ue_get_sdu(module_id_t module_idP,
}
buflen_remain = buflen - (total_mac_pdu_header_len + sdu_length_total);
// Compute final offset for padding and fill remainder of ULSCH with 0
if (buflen_remain > 0) {