Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
# Conflicts: # openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c # openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h # openair2/RRC/NR/rrc_gNB_reconfig.c
This commit is contained in:
+1
-1
@@ -369,7 +369,7 @@ gtpv1u_create_s1u_tunnel(), delete tunnel, ... functions are called inside the o
|
||||
# New GTP
|
||||
## initialization
|
||||
|
||||
ocp_gtpv1uTask(): this creates only the thread, doesn't configure anything
|
||||
gtpv1uTask(): this creates only the thread, doesn't configure anything
|
||||
gtpv1Init(): creates a listening socket to Linux for a given reception and select a local IP address
|
||||
|
||||
## newGtpuCreateTunnel()
|
||||
|
||||
@@ -206,19 +206,12 @@ eNBs =
|
||||
log_config :
|
||||
{
|
||||
global_log_level ="info";
|
||||
global_log_verbosity ="high";
|
||||
hw_log_level ="info";
|
||||
hw_log_verbosity ="medium";
|
||||
phy_log_level ="info";
|
||||
phy_log_verbosity ="medium";
|
||||
mac_log_level ="info";
|
||||
mac_log_verbosity ="high";
|
||||
rlc_log_level ="debug";
|
||||
rlc_log_verbosity ="high";
|
||||
pdcp_log_level ="info";
|
||||
pdcp_log_verbosity ="high";
|
||||
rrc_log_level ="info";
|
||||
rrc_log_verbosity ="medium";
|
||||
};
|
||||
|
||||
}
|
||||
@@ -267,17 +260,10 @@ RUs = (
|
||||
log_config :
|
||||
{
|
||||
global_log_level ="info";
|
||||
global_log_verbosity ="high";
|
||||
hw_log_level ="info";
|
||||
hw_log_verbosity ="medium";
|
||||
phy_log_level ="info";
|
||||
phy_log_verbosity ="medium";
|
||||
mac_log_level ="info";
|
||||
mac_log_verbosity ="high";
|
||||
rlc_log_level ="info";
|
||||
rlc_log_verbosity ="high";
|
||||
pdcp_log_level ="info";
|
||||
pdcp_log_verbosity ="high";
|
||||
rrc_log_level ="info";
|
||||
rrc_log_verbosity ="medium";
|
||||
};
|
||||
|
||||
@@ -258,18 +258,11 @@ security = {
|
||||
log_config :
|
||||
{
|
||||
global_log_level ="info";
|
||||
global_log_verbosity ="medium";
|
||||
hw_log_level ="info";
|
||||
hw_log_verbosity ="medium";
|
||||
phy_log_level ="info";
|
||||
phy_log_verbosity ="medium";
|
||||
mac_log_level ="info";
|
||||
mac_log_verbosity ="high";
|
||||
rlc_log_level ="info";
|
||||
rlc_log_verbosity ="medium";
|
||||
pdcp_log_level ="info";
|
||||
pdcp_log_verbosity ="medium";
|
||||
rrc_log_level ="info";
|
||||
rrc_log_verbosity ="medium";
|
||||
};
|
||||
|
||||
|
||||
@@ -62,7 +62,6 @@ ITTI init, useMME: 1
|
||||
[0m[0m[TMR] Starting itti queue: TASK_RRC_UE as task 31
|
||||
[0m[0m[TMR] Starting itti queue: TASK_NAS_UE as task 32
|
||||
[0m[0m[TMR] Starting itti queue: TASK_RAL_UE as task 33
|
||||
[0m[0m[TMR] Starting itti queue: TASK_MSC as task 34
|
||||
[0m[0m[TMR] Starting itti queue: TASK_GTPV1_U as task 35
|
||||
[0m[0m[TMR] Starting itti queue: TASK_UDP as task 36
|
||||
[0m[0m[TMR] Starting itti queue: TASK_CU_F1 as task 37
|
||||
|
||||
@@ -58,7 +58,6 @@ CPU Freq is 3.092986
|
||||
[0m[0m[TMR] Starting itti queue: TASK_RRC_UE as task 31
|
||||
[0m[0m[TMR] Starting itti queue: TASK_NAS_UE as task 32
|
||||
[0m[0m[TMR] Starting itti queue: TASK_RAL_UE as task 33
|
||||
[0m[0m[TMR] Starting itti queue: TASK_MSC as task 34
|
||||
[0m[0m[TMR] Starting itti queue: TASK_GTPV1_U as task 35
|
||||
[0m[0m[TMR] Starting itti queue: TASK_UDP as task 36
|
||||
[0m[0m[TMR] Starting itti queue: TASK_CU_F1 as task 37
|
||||
|
||||
Reference in New Issue
Block a user