From 8cf6c851e1d5f7a5a161a4e53138845b01417cb7 Mon Sep 17 00:00:00 2001
From: Andre Puschmann <andre@softwareradiosystems.com>
Date: Tue, 1 Feb 2022 17:05:19 +0100
Subject: [PATCH] srsue,rrc: remove phy_cfg_default header

* address Xicos comment in https://github.com/softwareradiosystems/srsLTE/pull/3836
---
 srsue/src/stack/rrc_nr/rrc_nr.cc | 2 +-
 srsue/src/ue.cc                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srsue/src/stack/rrc_nr/rrc_nr.cc b/srsue/src/stack/rrc_nr/rrc_nr.cc
index 16b198756..e51417e54 100644
--- a/srsue/src/stack/rrc_nr/rrc_nr.cc
+++ b/srsue/src/stack/rrc_nr/rrc_nr.cc
@@ -12,7 +12,6 @@
 
 #include "srsue/hdr/stack/rrc_nr/rrc_nr.h"
 #include "srsran/common/band_helper.h"
-#include "srsran/common/phy_cfg_nr_default.h"
 #include "srsran/common/security.h"
 #include "srsran/common/standard_streams.h"
 #include "srsran/interfaces/ue_pdcp_interfaces.h"
@@ -23,6 +22,7 @@
 using namespace asn1::rrc_nr;
 using namespace asn1;
 using namespace srsran;
+
 namespace srsue {
 
 const static char* rrc_nr_state_text[] = {"IDLE", "CONNECTED", "CONNECTED-INACTIVE"};
diff --git a/srsue/src/ue.cc b/srsue/src/ue.cc
index ef91501ce..8e6f2709f 100644
--- a/srsue/src/ue.cc
+++ b/srsue/src/ue.cc
@@ -277,7 +277,7 @@ int ue::parse_args(const all_args_t& args_)
   }
 
   // SA params
-  if (args.phy.nof_lte_carriers == 0 && args.phy.nof_nr_carriers == 1) {
+  if (args.phy.nof_lte_carriers == 0 && args.phy.nof_nr_carriers > 0) {
     // Update NAS-5G args
     args.stack.nas_5g.ia5g = args.stack.nas.eia;
     args.stack.nas_5g.ea5g = args.stack.nas.eea;