From dda5251037008b3563ab0aaf443eb7be3213887c Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Tue, 31 Jul 2018 02:55:22 -0700 Subject: net.h: Include linux/if_ether.h to avoid duplication There are plenty of existing drivers that have macros like ETH_ALEN defined in their own source files. Now that we imported the kernel's if_ether.h to U-Boot we can reduce some duplication. Signed-off-by: Bin Meng Acked-by: Joe Hershberger --- include/net.h | 1 + include/usb_ether.h | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'include') diff --git a/include/net.h b/include/net.h index 2b2deb5aae..156bdc1da4 100644 --- a/include/net.h +++ b/include/net.h @@ -14,6 +14,7 @@ #include #include /* for nton* / ntoh* stuff */ +#include #define DEBUG_LL_STATE 0 /* Link local state machine changes */ #define DEBUG_DEV_PKT 0 /* Packets or info directed to the device */ diff --git a/include/usb_ether.h b/include/usb_ether.h index 49f47d372a..e85acadb7f 100644 --- a/include/usb_ether.h +++ b/include/usb_ether.h @@ -8,16 +8,6 @@ #include -/* - * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble - * and FCS/CRC (frame check sequence). - */ -#define ETH_ALEN 6 /* Octets in one ethernet addr */ -#define ETH_HLEN 14 /* Total octets in header. */ -#define ETH_ZLEN 60 /* Min. octets in frame sans FCS */ -#define ETH_DATA_LEN 1500 /* Max. octets in payload */ -#define ETH_FRAME_LEN PKTSIZE_ALIGN /* Max. octets in frame sans FCS */ - /* TODO(sjg@chromium.org): Remove @pusb_dev when all boards use CONFIG_DM_ETH */ struct ueth_data { /* eth info */ -- cgit