bfdd,isisd,nhrpd: cleanup if_ether.h

Cleanup if_ether.h Signed-off-by: Louis Scalbert <[email protected]>
FRRouting · Jan 12, 2024 · 139f116 · 139f116
1 parent ab11d1f
commit 139f116
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/bfdd/bfd_packet.c b/bfdd/bfd_packet.c
@@ -22,6 +22,7 @@
 #include <linux/if_packet.h>
 #endif /* BFD_LINUX */
 
+#include <net/if_arp.h>
 #include <netinet/if_ether.h>
 #include <netinet/udp.h>
 

diff --git a/isisd/isis_bpf.c b/isisd/isis_bpf.c
@@ -12,7 +12,10 @@
 #include <fcntl.h>
 
 #if ISIS_METHOD == ISIS_METHOD_BPF
+#ifndef GNU_LINUX
+#include <net/if_arp.h>
 #include <netinet/if_ether.h>
+#endif /* !GNU_LINUX */
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <net/bpf.h>

diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
@@ -7,11 +7,10 @@
  *                           Institute of Communications Engineering
  */
 #include <zebra.h>
-#ifdef GNU_LINUX
-#include <net/ethernet.h>
-#else
+#ifndef GNU_LINUX
+#include <net/if_arp.h>
 #include <netinet/if_ether.h>
-#endif
+#endif /* !GNU_LINUX */
 
 #include "log.h"
 #include "memory.h"

diff --git a/isisd/isis_dlpi.c b/isisd/isis_dlpi.c
@@ -9,7 +9,9 @@
 
 #include <zebra.h>
 #if ISIS_METHOD == ISIS_METHOD_DLPI
+#ifndef GNU_LINUX
 #include <netinet/if_ether.h>
+#endif /* !GNU_LINUX */
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>

diff --git a/nhrpd/netlink_arp.c b/nhrpd/netlink_arp.c
@@ -12,7 +12,6 @@
 #endif
 
 #include <fcntl.h>
-#include <netinet/if_ether.h>
 #include <linux/netlink.h>
 #include <linux/neighbour.h>
 #include <linux/netfilter/nfnetlink_log.h>

diff --git a/nhrpd/nhrp_multicast.c b/nhrpd/nhrp_multicast.c
@@ -13,7 +13,9 @@
 
 #include <fcntl.h>
 #include <net/ethernet.h>
+#ifndef GNU_LINUX
 #include <netinet/if_ether.h>
+#endif /* !GNU_LINUX */
 #include <linux/netlink.h>
 #include <linux/neighbour.h>
 #include <linux/netfilter/nfnetlink_log.h>