From a570e63c5b8977a8f864cde6d7103a2233ae8c83 Mon Sep 17 00:00:00 2001
From: Xavier Arteaga <xavier@softwareradiosystems.com>
Date: Fri, 20 Oct 2017 15:05:04 +0200
Subject: [PATCH] Corrected bug in RA

---
 lib/include/srslte/phy/phch/ra.h |  2 --
 lib/src/phy/phch/ra.c            | 14 ++++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/include/srslte/phy/phch/ra.h b/lib/include/srslte/phy/phch/ra.h
index 680d80dd6..aef8f4751 100644
--- a/lib/include/srslte/phy/phch/ra.h
+++ b/lib/include/srslte/phy/phch/ra.h
@@ -103,9 +103,7 @@ typedef struct SRSLTE_API {
   bool prb_idx[2][SRSLTE_MAX_PRB];
   uint32_t nof_prb;  
   uint32_t Qm[SRSLTE_MAX_CODEWORDS];
-  uint32_t Qm2[SRSLTE_MAX_CODEWORDS];
   srslte_ra_mcs_t mcs[SRSLTE_MAX_CODEWORDS];
-  srslte_ra_mcs_t mcs2[SRSLTE_MAX_CODEWORDS];
   uint32_t nof_tb;
   srslte_sf_t sf_type;
   bool tb_en[SRSLTE_MAX_CODEWORDS];
diff --git a/lib/src/phy/phch/ra.c b/lib/src/phy/phch/ra.c
index 8cae9fe65..913bd9548 100644
--- a/lib/src/phy/phch/ra.c
+++ b/lib/src/phy/phch/ra.c
@@ -549,7 +549,7 @@ static int dl_dci_to_grant_mcs(srslte_ra_dl_dci_t *dci, srslte_ra_dl_grant_t *gr
   }
   grant->pinfo = dci->pinfo;
 
-  if (tbs < 0) {
+  if (grant->mcs[0].tbs < 0 || grant->mcs[1].tbs < 0) {
     return SRSLTE_ERROR; 
   } else {    
     return SRSLTE_SUCCESS; 
@@ -584,10 +584,12 @@ int srslte_ra_dl_dci_to_grant(srslte_ra_dl_dci_t *dci,
   if (msg_rnti >= SRSLTE_CRNTI_START && msg_rnti <= SRSLTE_CRNTI_END) {
     crc_is_crnti = true; 
   }
-  // Compute PRB allocation 
-  if (!srslte_ra_dl_dci_to_grant_prb_allocation(dci, grant, nof_prb)) {
-    // Compute MCS 
-    if (!dl_dci_to_grant_mcs(dci, grant, crc_is_crnti)) {            
+  // Compute PRB allocation
+  int ret =srslte_ra_dl_dci_to_grant_prb_allocation(dci, grant, nof_prb);
+  if (!ret) {
+    // Compute MCS
+    ret = dl_dci_to_grant_mcs(dci, grant, crc_is_crnti);
+    if (ret == SRSLTE_SUCCESS) {
       // Apply Section 7.1.7.3. If RA-RNTI and Format1C rv_idx=0
       if (msg_rnti >= SRSLTE_RARNTI_START && msg_rnti <= SRSLTE_RARNTI_END && 
         dci->dci_is_1c) 
@@ -869,4 +871,4 @@ void srslte_ra_prb_fprint(FILE *f, srslte_ra_dl_grant_t *grant) {
     }
   }
   
-}
\ No newline at end of file
+}