diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2011-06-10 05:17:59 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-06-10 05:17:59 +0200 |
| commit | f533ec876716415ed0e6ba28d13dfb6263068e82 (patch) | |
| tree | 30b5b8ddcad3d2673d76110b8a792a5cd1b3b067 /networking/udhcp | |
| parent | d488f5e8dbdcd1f5f0ebb2ee9c1f2fb4a5374290 (diff) | |
| download | busybox-f533ec876716415ed0e6ba28d13dfb6263068e82.tar.gz | |
*: simplify Ethernet header includes
Signed-off-by: Dan Fandrich <dan@coneharvesters.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/udhcp')
| -rw-r--r-- | networking/udhcp/dhcpc.c | 10 | ||||
| -rw-r--r-- | networking/udhcp/packet.c | 13 | ||||
| -rw-r--r-- | networking/udhcp/socket.c | 11 |
3 files changed, 6 insertions, 28 deletions
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c index 5d3291b8c..4d755e6b8 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 2b7528cc7..66b42c5e1 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 39f1cec54..a5220ba74 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) { |