Merge remote-tracking branch 'origin/develop' into oairu

Conflicts: openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
2021-02-07 18:23:46 +01:00
parent d06018d1e3 403db5f66e
commit 846c67b9bd
123 changed files with 11822 additions and 6601 deletions
@@ -734,7 +734,7 @@ void calculate_max_mcs_min_rb(module_id_t mod_id,

  /* find maximum MCS */
  while ((phr - *tx_power < 0 || tbs > bytes) && *mcs > 3) {
-    mcs--;
+    (*mcs)--;
    tbs = get_TBS_UL(*mcs, rb_table[*rb_index]);
    *tx_power = estimate_ue_tx_power(0,tbs * 8, rb_table[*rb_index], 0, Ncp, 0);
  }