From 34e64ab1eb0ecb8a12fc8d44c1d10e1cb653cefa Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Thu, 12 Oct 2023 07:46:25 +0200
Subject: [PATCH] Remove unused/useless Ethernet variables

---
 radio/ETHERNET/eth_raw.c      | 10 ++--------
 radio/ETHERNET/ethernet_lib.h | 12 +++---------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/radio/ETHERNET/eth_raw.c b/radio/ETHERNET/eth_raw.c
index 89d6c97c3f..1b48a762f4 100644
--- a/radio/ETHERNET/eth_raw.c
+++ b/radio/ETHERNET/eth_raw.c
@@ -87,7 +87,6 @@ int eth_socket_init_raw(openair0_device *device) {
     }
   
   /* initialize destination address */
-  bzero((void *)&(eth->local_addrc_ll), sizeof(struct sockaddr_ll));
   bzero((void *)&(eth->local_addrd_ll), sizeof(struct sockaddr_ll));
   bzero((void *)&(eth->if_index), sizeof(struct ifreq)); 
   
@@ -98,17 +97,12 @@ int eth_socket_init_raw(openair0_device *device) {
   for (int i=0;i<eth->num_fd;i++)
     if (ioctl(eth->sockfdd[i], SIOCGIFINDEX, &(eth->if_index)) < 0)
       perror("SIOCGIFINDEX");
-   
-  eth->local_addrc_ll.sll_family   = AF_PACKET;
-  eth->local_addrc_ll.sll_ifindex  = eth->if_index.ifr_ifindex;
+
   eth->local_addrd_ll.sll_family   = AF_PACKET;
   eth->local_addrd_ll.sll_ifindex  = eth->if_index.ifr_ifindex;
   /* hear traffic from specific protocol*/
-  eth->local_addrc_ll.sll_protocol = htons((short)device->eth_params->my_portc);
   eth->local_addrd_ll.sll_protocol = htons((short)device->eth_params->my_portd);
-  
-  eth->local_addrc_ll.sll_halen    = ETH_ALEN;
-  eth->local_addrc_ll.sll_pkttype  = PACKET_OTHERHOST;
+
   eth->local_addrd_ll.sll_halen    = ETH_ALEN;
   eth->local_addrd_ll.sll_pkttype  = PACKET_OTHERHOST;
   eth->addr_len = sizeof(struct sockaddr_ll);
diff --git a/radio/ETHERNET/ethernet_lib.h b/radio/ETHERNET/ethernet_lib.h
index edb093e525..873ef26e12 100644
--- a/radio/ETHERNET/ethernet_lib.h
+++ b/radio/ETHERNET/ethernet_lib.h
@@ -80,14 +80,6 @@ typedef struct {
   struct sockaddr_in local_addrd;
   /*!\brief address length for both UDP and RAW socket*/
   int addr_len;
-  /*!\brief destination address (control) for RAW socket*/
-  struct sockaddr_ll dest_addrc_ll;
-  /*!\brief local address (control) for RAW socket*/
-  struct sockaddr_ll local_addrc_ll;
-  /*!\brief destination address (user) for RAW socket*/
-  struct sockaddr_ll dest_addrd_ll;
-  /*!\brief local address (user) for RAW socket*/
-  struct sockaddr_ll local_addrd_ll;
   /*!\brief inteface index for RAW socket*/
   struct ifreq if_index;
   /*!\brief timeout ms */ 
@@ -146,7 +138,9 @@ typedef struct {
   /*!\brief precomputed ethernet header (control) */
   struct ether_header ehc; 
   /*!\brief precomputed ethernet header (data) */
-  struct ether_header ehd; 
+  struct ether_header ehd;
+  /*!\brief local address (user) for RAW socket*/
+  struct sockaddr_ll local_addrd_ll;
 } eth_state_t;