[git commit] *: simplify Ethernet header includes
Denys Vlasenko
vda.linux at googlemail.com
Fri Jun 10 03:17:59 UTC 2011
commit: http://git.busybox.net/busybox/commit/?id=f533ec876716415ed0e6ba28d13dfb6263068e82
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Dan Fandrich <dan at coneharvesters.com>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
include/platform.h | 13 ++++++++++---
networking/ether-wake.c | 4 +---
networking/ifconfig.c | 12 ++++--------
networking/ifplugd.c | 4 +++-
networking/interface.c | 9 ++++-----
networking/libiproute/ll_proto.c | 6 +-----
networking/udhcp/dhcpc.c | 10 ++--------
networking/udhcp/packet.c | 13 +++----------
networking/udhcp/socket.c | 11 +----------
networking/zcip.c | 4 +---
10 files changed, 30 insertions(+), 56 deletions(-)
diff --git a/include/platform.h b/include/platform.h
index 780568c..429220b 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -332,8 +332,8 @@ typedef unsigned smalluint;
/* ---- Who misses what? ------------------------------------ */
-/* Assume all these functions exist by default. Platforms where it is not
- * true will #undef them below.
+/* Assume all these functions and header files exist by default.
+ * Platforms where it is not true will #undef them below.
*/
#define HAVE_CLEARENV 1
#define HAVE_FDATASYNC 1
@@ -349,9 +349,14 @@ typedef unsigned smalluint;
#define HAVE_STRSEP 1
#define HAVE_STRSIGNAL 1
#define HAVE_VASPRINTF 1
+#define HAVE_XTABS 1
#define HAVE_MNTENT_H 1
+#define HAVE_NET_ETHERNET_H 1
#define HAVE_SYS_STATFS_H 1
-#define HAVE_XTABS 1
+
+#if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 1)
+# undef HAVE_NET_ETHERNET_H
+#endif
#if defined(__dietlibc__)
# undef HAVE_STRCHRNUL
@@ -368,6 +373,7 @@ typedef unsigned smalluint;
# undef HAVE_STRSEP
# undef HAVE_STRSIGNAL
# undef HAVE_VASPRINTF
+# undef HAVE_NET_ETHERNET_H
#endif
#if defined(__FreeBSD__)
@@ -395,6 +401,7 @@ typedef unsigned smalluint;
# undef HAVE_DPRINTF
# undef HAVE_STPCPY
# undef HAVE_STRCHRNUL
+# undef HAVE_NET_ETHERNET_H
#endif
/*
diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index 260ba24..6a88279 100644
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -74,13 +74,11 @@
//usage: "\n -i iface Interface to use (default eth0)"
//usage: "\n -p pass Append four or six byte password PW to the packet"
+#include "libbb.h"
#include <netpacket/packet.h>
-#include <net/ethernet.h>
#include <netinet/ether.h>
#include <linux/if.h>
-#include "libbb.h"
-
/* Note: PF_INET, SOCK_DGRAM, IPPROTO_UDP would allow SIOCGIFHWADDR to
* work as non-root, but we need SOCK_PACKET to specify the Ethernet
* destination address.
diff --git a/networking/ifconfig.c b/networking/ifconfig.c
index 2a56da5..b6604f5 100644
--- a/networking/ifconfig.c
+++ b/networking/ifconfig.c
@@ -46,18 +46,14 @@
//usage: " [mem_start NN] [io_addr NN] [irq NN]\n")
//usage: " [up|down] ..."
+#include "libbb.h"
+#include "inet_common.h"
#include <net/if.h>
#include <net/if_arp.h>
#include <netinet/in.h>
-#if defined(__GLIBC__) && __GLIBC__ >=2 && __GLIBC_MINOR__ >= 1
-#include <netpacket/packet.h>
-#include <net/ethernet.h>
-#else
-#include <sys/types.h>
-#include <netinet/if_ether.h>
+#ifdef HAVE_NET_ETHERNET_H
+# include <net/ethernet.h>
#endif
-#include "libbb.h"
-#include "inet_common.h"
#if ENABLE_FEATURE_IFCONFIG_SLIP
# include <net/if_slip.h>
diff --git a/networking/ifplugd.c b/networking/ifplugd.c
index 57d04e6..d8358cd 100644
--- a/networking/ifplugd.c
+++ b/networking/ifplugd.c
@@ -37,7 +37,9 @@
#include <linux/if.h>
#include <linux/mii.h>
#include <linux/ethtool.h>
-#include <net/ethernet.h>
+#ifdef HAVE_NET_ETHERNET_H
+# include <net/ethernet.h>
+#endif
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
#include <linux/sockios.h>
diff --git a/networking/interface.c b/networking/interface.c
index bea54c1..79c322e 100644
--- a/networking/interface.c
+++ b/networking/interface.c
@@ -30,15 +30,14 @@
* 20001008 - Bernd Eckenfels, Patch from RH for setting mtu
* (default AF was wrong)
*/
+
+#include "libbb.h"
+#include "inet_common.h"
#include <net/if.h>
#include <net/if_arp.h>
-#ifndef __UCLIBC__
+#ifdef HAVE_NET_ETHERNET_H
# include <net/ethernet.h>
-#else
-# include <linux/if_ether.h>
#endif
-#include "libbb.h"
-#include "inet_common.h"
#if ENABLE_FEATURE_HWIB
/* #include <linux/if_infiniband.h> */
diff --git a/networking/libiproute/ll_proto.c b/networking/libiproute/ll_proto.c
index 04925ec..7aac836 100644
--- a/networking/libiproute/ll_proto.c
+++ b/networking/libiproute/ll_proto.c
@@ -12,11 +12,7 @@
#include "rt_names.h"
#include "utils.h"
-#if defined(__GLIBC__) && __GLIBC__ >=2 && __GLIBC_MINOR__ >= 1
-#include <net/ethernet.h>
-#else
-#include <linux/if_ether.h>
-#endif
+#include <netinet/if_ether.h>
#if !ENABLE_WERROR
#warning de-bloat
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 5d3291b..4d755e6 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -25,14 +25,8 @@
#include "dhcpd.h"
#include "dhcpc.h"
-#include <asm/types.h>
-#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION)
-# include <netpacket/packet.h>
-# include <net/ethernet.h>
-#else
-# include <linux/if_packet.h>
-# include <linux/if_ether.h>
-#endif
+#include <netinet/if_ether.h>
+#include <netpacket/packet.h>
#include <linux/filter.h>
/* struct client_config_t client_config is in bb_common_bufsiz1 */
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index 2b7528c..66b42c5 100644
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -6,18 +6,11 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-#include <netinet/in.h>
-#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION
-# include <netpacket/packet.h>
-# include <net/ethernet.h>
-#else
-# include <asm/types.h>
-# include <linux/if_packet.h>
-# include <linux/if_ether.h>
-#endif
-
#include "common.h"
#include "dhcpd.h"
+#include <netinet/in.h>
+#include <netinet/if_ether.h>
+#include <netpacket/packet.h>
void FAST_FUNC udhcp_init_header(struct dhcp_packet *packet, char type)
{
diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c
index 39f1cec..a5220ba 100644
--- a/networking/udhcp/socket.c
+++ b/networking/udhcp/socket.c
@@ -22,17 +22,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <net/if.h>
-#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION
-# include <netpacket/packet.h>
-# include <net/ethernet.h>
-#else
-# include <asm/types.h>
-# include <linux/if_packet.h>
-# include <linux/if_ether.h>
-#endif
-
#include "common.h"
+#include <net/if.h>
int FAST_FUNC udhcp_read_interface(const char *interface, int *ifindex, uint32_t *nip, uint8_t *mac)
{
diff --git a/networking/zcip.c b/networking/zcip.c
index 6b7f214..8a35eca 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -35,14 +35,12 @@
//usage: "\nWith no -q, runs continuously monitoring for ARP conflicts,"
//usage: "\nexits only on I/O errors (link down etc)"
+#include "libbb.h"
#include <netinet/ether.h>
-#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
-#include <linux/if_packet.h>
#include <linux/sockios.h>
-#include "libbb.h"
#include <syslog.h>
/* We don't need more than 32 bits of the counter */
--
1.7.3.4
More information about the busybox-cvs
mailing list