moved gw metrics out of stack_metrics_t

srsue/hdr/stack/upper/gw.h

@@ -70,9 +70,9 @@ public:
 private:
   static const int GW_THREAD_PRIO = 7;
 
-  stack_interface_gw*         stack;
-  srslte::byte_buffer_pool   *pool;
-  srslte::logger*             logger;
+  stack_interface_gw*       stack;
+  srslte::byte_buffer_pool* pool;
+  srslte::logger*           logger;
 
   gw_args_t args;
 

srsue/hdr/ue_metrics_interface.h

@@ -43,13 +43,13 @@ typedef struct {
 typedef struct {
   mac_metrics_t         mac[SRSLTE_MAX_CARRIERS];
   srslte::rlc_metrics_t rlc;
-  gw_metrics_t          gw;
   nas_metrics_t         nas;
 } stack_metrics_t;
 
 typedef struct {
   rf_metrics_t    rf;
   phy_metrics_t   phy;
+  gw_metrics_t    gw;
   stack_metrics_t stack;
 } ue_metrics_t;
 

srsue/src/ue.cc

@@ -260,7 +260,7 @@ bool ue::get_metrics(ue_metrics_t* m)
   phy->get_metrics(&m->phy);
   radio->get_metrics(&m->rf);
   stack->get_metrics(&m->stack);
-  gw_inst->get_metrics(m->stack.gw);
+  gw_inst->get_metrics(m->gw);
   return true;
 }