From 8dcc3ddb4d7aac790d3867e63c04026f67e137c7 Mon Sep 17 00:00:00 2001
From: Sandeep Kumar <ee13b1025@iith.ac.in>
Date: Wed, 6 Jul 2016 09:56:13 +0200
Subject: [PATCH] if_defs and eth_lib .h cleanup

---
 openair1/PHY/LTE_TRANSPORT/if4_tools.c             | 1 -
 openair1/PHY/LTE_TRANSPORT/if5_mobipass_tools.c    | 1 -
 targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c      | 3 ---
 targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c      | 1 -
 targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c | 1 -
 targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h      | 3 +++
 6 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/openair1/PHY/LTE_TRANSPORT/if4_tools.c b/openair1/PHY/LTE_TRANSPORT/if4_tools.c
index 587d139422..a0e4d2e3f7 100644
--- a/openair1/PHY/LTE_TRANSPORT/if4_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/if4_tools.c
@@ -39,7 +39,6 @@
 */
 
 #include "PHY/defs.h"
-#include "PHY/LTE_TRANSPORT/if4_tools.h"
 #include "PHY/TOOLS/alaw_lut.h"
 
 #include "targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h"
diff --git a/openair1/PHY/LTE_TRANSPORT/if5_mobipass_tools.c b/openair1/PHY/LTE_TRANSPORT/if5_mobipass_tools.c
index d38dfb76a5..ab60c2fb0f 100644
--- a/openair1/PHY/LTE_TRANSPORT/if5_mobipass_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/if5_mobipass_tools.c
@@ -39,7 +39,6 @@
 */
 
 #include "PHY/defs.h"
-#include "PHY/LTE_TRANSPORT/if5_mobipass_tools.h"
 
 #include "targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h"
 
diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
index bf5554fd26..699d15350b 100644
--- a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
+++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
@@ -51,9 +51,6 @@
 
 #include "common_lib.h"
 #include "ethernet_lib.h"
-#include "if_defs.h"
-#include "openair1/PHY/LTE_TRANSPORT/if4_tools.h"
-#include "openair1/PHY/LTE_TRANSPORT/if5_mobipass_tools.h"
 
 #define DEBUG 0
 
diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
index 55b5e08535..a9706c73bd 100644
--- a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
+++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
@@ -52,7 +52,6 @@
 
 #include "common_lib.h"
 #include "ethernet_lib.h"
-#include "if_defs.h"
 
 #define DEBUG 0
 struct sockaddr_in dest_addr[MAX_INST];
diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c b/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
index 0ec8971ba8..f29375dac3 100644
--- a/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
+++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
@@ -51,7 +51,6 @@
 
 #include "common_lib.h"
 #include "ethernet_lib.h"
-#include "if_defs.h"
 
 int num_devices_eth = 0;
 struct sockaddr_in dest_addr[MAX_INST];
diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h b/targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
index e17890836b..86f580d911 100644
--- a/targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
+++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
@@ -41,6 +41,9 @@
 #include <netinet/ether.h>
 #include <stdint.h>
 
+#include "PHY/LTE_TRANSPORT/if4_tools.h"
+#include "PHY/LTE_TRANSPORT/if5_mobipass_tools.h"
+
 // ETH transport preference modes
 #define ETH_UDP_MODE        0
 #define ETH_RAW_MODE        1
-- 
GitLab