Merge remote-tracking branch 'origin/code-cleanup-2021oct24' into integration_2021_wk45_b

2021-11-08 13:12:52 +01:00
parent 9c1336157e 8b195c6cf0
commit 4c2c7f92a5
79 changed files with 27 additions and 3325 deletions
@@ -111,14 +111,6 @@ typedef struct gtpv1u_data_s {
  uint16_t              seq_num;
  uint8_t               restart_counter;

-#ifdef GTPU_IN_KERNEL
-  char                 *interface_name;
-  int                   interface_index;
-
-  struct iovec         *malloc_ring;
-  void                 *sock_mmap_ring[16];
-  int                   sock_desc[16]; // indexed by marking
-#endif
 } gtpv1u_data_t;

 int
@@ -102,14 +102,6 @@ typedef struct nr_gtpv1u_data_s {
  uint16_t              seq_num;
  uint8_t               restart_counter;

-#ifdef GTPU_IN_KERNEL
-  char                 *interface_name;
-  int                   interface_index;
-
-  struct iovec         *malloc_ring;
-  void                 *sock_mmap_ring[16];
-  int                   sock_desc[16]; // indexed by marking
-#endif
 } nr_gtpv1u_data_t;