Merge remote-tracking branch 'origin/feature-228-rrc-rel14' into develop_integration_w12

2017-03-24 17:08:27 +01:00
parent 75aff99bf6 4fcb6272f4
commit fc5c876a81
47 changed files with 12415 additions and 294 deletions
@@ -930,7 +930,7 @@ l2l1_task (void *args_p)
          }
        }

-#ifdef Rel10
+#if defined(Rel10) || defined(Rel14)

        for (RN_id=oai_emulation.info.first_rn_local;
             RN_id<oai_emulation.info.first_rn_local+oai_emulation.info.nb_rn_local;