Merge remote-tracking branch 'oai/develop' into oai-integration

Conflicts: cmake_targets/CMakeLists.txt maketags openair2/RRC/LITE/rrc_eNB.c
2016-09-03 00:17:59 +03:00
parent 849639f3a2 85e562d0b9
commit 343f338d3f
96 changed files with 3932 additions and 7520 deletions
@@ -75,7 +75,8 @@ public_mem_block(void         check_mem_area (void);)
 private_mem_block(void        check_free_mem_block (mem_block_t * leP);)
 #    endif
 #ifdef USER_MODE
-#    define MEM_SCALE /*MAX_RG */ MAX_MOBILES_PER_ENB
+//#    define MEM_SCALE MAX_MOBILES_PER_ENB*NB_RB_MAX
+#    define MEM_SCALE MAX_MOBILES_PER_ENB
 #else
 #    ifdef NODE_RG
 #        define MEM_SCALE 2