From 1fc33b3bbbc8348808fc16db8e0e1e17a3d4a6fe Mon Sep 17 00:00:00 2001
From: Guy De Souza <desouza@eurecom.fr>
Date: Tue, 27 Nov 2018 11:55:11 +0100
Subject: [PATCH] TBS calculation fixes

---
 openair1/PHY/NR_TRANSPORT/nr_tbs_tools.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openair1/PHY/NR_TRANSPORT/nr_tbs_tools.c b/openair1/PHY/NR_TRANSPORT/nr_tbs_tools.c
index 6467149dda..0b8ab56329 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_tbs_tools.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_tbs_tools.c
@@ -144,20 +144,20 @@ void nr_get_tbs(nfapi_nr_dl_config_dlsch_pdu *dlsch_pdu,
       }
   }
   else {
-    n = log2(Ninfo)-29;
+    n = log2(Ninfo-24)-5;
     Ninfo_prime = max(3840, (ROUNDIDIV((Ninfo-24),(1<<n)))<<n);
 
     if (R<256) {
       C = CEILIDIV((Ninfo_prime+24),3816);
-      TBS = (C*CEILIDIV((Ninfo_prime+24),(C<<3)))<<3;
+      TBS = (C<<3)*CEILIDIV((Ninfo_prime+24),(C<<3)) - 24;
     }
     else {
       if (Ninfo_prime>8424) {
         C = CEILIDIV((Ninfo_prime+24),8424);
-        TBS = (C*CEILIDIV((Ninfo_prime+24),(C<<3)))<<3;
+        TBS = (C<<3)*CEILIDIV((Ninfo_prime+24),(C<<3)) - 24;
       }
       else
-        TBS = (CEILIDIV((Ninfo_prime+24),8) - 24)<<3;
+        TBS = ((CEILIDIV((Ninfo_prime+24),8))<<3) - 24;
     }    
   }