drivers/net/vsc9953: Add commands to enable/disable HW learning

[oweals/u-boot.git] / drivers / net / e1000.h

diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h
index 232c95d2a4eaf5d38740b1445b46f5cef15fd922..c851922ae5c791670778b9111e96cade2fea3419 100644 (file)
--- a/drivers/net/e1000.h
+++ b/drivers/net/e1000.h
@@ -19,11 +19,13 @@
 #ifndef _E1000_HW_H_
 #define _E1000_HW_H_
 
-#include <common.h>
 #include <linux/list.h>
 #include <malloc.h>
 #include <net.h>
+/* Avoids a compile error since struct eth_device is not defined */
+#ifndef CONFIG_DM_ETH
 #include <netdev.h>
+#endif
 #include <asm/io.h>
 #include <pci.h>
 
@@ -1072,8 +1074,11 @@ typedef enum {
 
 /* Structure containing variables used by the shared code (e1000_hw.c) */
 struct e1000_hw {
+       const char *name;
        struct list_head list_node;
+#ifndef CONFIG_DM_ETH
        struct eth_device *nic;
+#endif
 #ifdef CONFIG_E1000_SPI
        struct spi_slave spi;
 #endif
@@ -2460,7 +2465,7 @@ struct e1000_hw {
 #define MII_CR_SPEED_100               0x2000
 #define MII_CR_SPEED_10                0x0000
 #define E1000_PHY_ADDRESS              0x01
-#define PHY_AUTO_NEG_TIME              45      /* 4.5 Seconds */
+#define PHY_AUTO_NEG_TIME              80      /* 8.0 Seconds */
 #define PHY_FORCE_TIME                 20      /* 2.0 Seconds */
 #define PHY_REVISION_MASK              0xFFFFFFF0
 #define DEVICE_SPEED_MASK              0x00000300      /* Device Ctrl Reg Speed Mask */