From a6348e85674cf5085aae6482a0d6436d4ae271d2 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@eurecom.fr>
Date: Sat, 12 Dec 2020 17:51:36 +0100
Subject: [PATCH] nr_generate_Msg2(): link TX_data/PDSCH PDU with common PDU
index
---
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
index 64d50516d4b..ff5662fd9d5 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
@@ -858,7 +858,11 @@ void nr_generate_Msg2(module_id_t module_idP,
pdsch_pdu_rel15->pduBitmap = 0;
pdsch_pdu_rel15->rnti = RA_rnti;
- pdsch_pdu_rel15->pduIndex = 0;
+ /* SCF222: PDU index incremented for each PDSCH PDU sent in TX control
+ * message. This is used to associate control information to data and is
+ * reset every slot. */
+ const int pduindex = nr_mac->pdu_index[CC_id]++;
+ pdsch_pdu_rel15->pduIndex = pduindex;
pdsch_pdu_rel15->BWPSize = NRRIV2BW(bwp->bwp_Common->genericParameters.locationAndBandwidth, MAX_BWP_SIZE);
@@ -976,7 +980,7 @@ void nr_generate_Msg2(module_id_t module_idP,
// DL TX request
tx_req->PDU_length = pdsch_pdu_rel15->TBSize[0];
- tx_req->PDU_index = nr_mac->pdu_index[CC_id]++;
+ tx_req->PDU_index = pduindex;
tx_req->num_TLV = 1;
tx_req->TLVs[0].length = 8;
nr_mac->TX_req[CC_id].SFN = frameP;
--
GitLab