pinctrl: a3700: Fix uart2 group selection register mask

[oweals/u-boot.git] / include / net.h

diff --git a/include/net.h b/include/net.h
index 61568f6b319d107e332781f404b9c388ea23229e..2eaa88224c9050755330e67a57ae7b541cfaa3fa 100644 (file)
--- a/include/net.h
+++ b/include/net.h
@@ -12,10 +12,6 @@
 #ifndef __NET_H__
 #define __NET_H__
 
-#if defined(CONFIG_8xx)
-#include <commproc.h>
-#endif /* CONFIG_8xx */
-
 #include <asm/cache.h>
 #include <asm/byteorder.h>     /* for nton* / ntoh* stuff */
 
@@ -40,6 +36,11 @@
 
 /* ARP hardware address length */
 #define ARP_HLEN 6
+/*
+ * The size of a MAC address in string form, each digit requires two chars
+ * and five separator characters to form '00:00:00:00:00:00'.
+ */
+#define ARP_HLEN_ASCII (ARP_HLEN * 2) + (ARP_HLEN - 1)
 
 /* IPv4 addresses are always 32 bits in size */
 struct in_addr {
@@ -163,7 +164,8 @@ void eth_halt_state_only(void); /* Set passive state */
 
 #ifndef CONFIG_DM_ETH
 struct eth_device {
-       char name[16];
+#define ETH_NAME_LEN 16
+       char name[ETH_NAME_LEN];
        unsigned char enetaddr[ARP_HLEN];
        phys_addr_t iobase;
        int state;