Merge remote-tracking branch 'origin/nr_multiple_ue' into integration_2021_wk45_b

2021-11-08 13:13:56 +01:00
parent cf41f0ccda b64f9f379f
commit 88fd5df1f0
2 changed files with 2 additions and 2 deletions
@@ -77,7 +77,7 @@
    #else
      #define MAX_MOBILES_PER_ENB         4
      #define MAX_MOBILES_PER_ENB_NB_IoT  4
-      #define MAX_MOBILES_PER_GNB         2//16
+      #define MAX_MOBILES_PER_GNB         4//16
      #define MAX_eNB                      2
      #define MAX_gNB                      2
    #endif
@@ -446,7 +446,7 @@ void nr_store_dlsch_buffer(module_id_t module_id,

    if (sched_ctrl->num_total_bytes == 0
        && !sched_ctrl->ta_apply) /* If TA should be applied, give at least one RB */
-      return;
+      continue;

    LOG_D(NR_MAC,
          "[%s][%d.%d], %s%d->DLSCH, RLC status %d bytes TA %d\n",