Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
<JIRA ID: ODUHIGH-368 : Slice information associated during PDU session establishment...
[o-du/l2.git]
/
src
/
5gnrmac
/
mac_demux.c
diff --git
a/src/5gnrmac/mac_demux.c
b/src/5gnrmac/mac_demux.c
index
1ef7f01
..
1ef38fe
100644
(file)
--- a/
src/5gnrmac/mac_demux.c
+++ b/
src/5gnrmac/mac_demux.c
@@
-44,7
+44,7
@@
* RFAILED
*
* ****************************************************************/
* RFAILED
*
* ****************************************************************/
-uint8_t unpackRxData(uint16_t cellId, Slot
Ind
Info slotInfo, RxDataIndPdu *rxDataIndPdu)
+uint8_t unpackRxData(uint16_t cellId, Slot
Timing
Info slotInfo, RxDataIndPdu *rxDataIndPdu)
{
uint8_t ueIdx = 0; /* Iterator for UE list */
uint8_t lcId = 0; /* LC ID of a sub pdu */
{
uint8_t ueIdx = 0; /* Iterator for UE list */
uint8_t lcId = 0; /* LC ID of a sub pdu */
@@
-132,12
+132,12
@@
uint8_t unpackRxData(uint16_t cellId, SlotIndInfo slotInfo, RxDataIndPdu *rxData
if(macCb.macCell[cellIdx]->macRaCb[ueIdx].crnti == rxDataIndPdu->rnti)
{
MAC_FREE(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4Pdu, \
if(macCb.macCell[cellIdx]->macRaCb[ueIdx].crnti == rxDataIndPdu->rnti)
{
MAC_FREE(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4Pdu, \
- macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen);
-
MAC_FREE(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu, \
- macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TbSize);
+
macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen);
+ MAC_FREE(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu, \
+ macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TbSize
- TX_PAYLOAD_HDR_LEN
);
memset(&macCb.macCell[cellIdx]->macRaCb[ueIdx], 0, sizeof(MacRaCbInfo));
}
memset(&macCb.macCell[cellIdx]->macRaCb[ueIdx], 0, sizeof(MacRaCbInfo));
}
-
+
/* Send UL Data to RLC */
ret = macProcUlData(cellId, rxDataIndPdu->rnti, slotInfo, lcId, length, pdu);
/* Send UL Data to RLC */
ret = macProcUlData(cellId, rxDataIndPdu->rnti, slotInfo, lcId, length, pdu);