Changeset 64740 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Nov 24, 2016 9:45:14 AM (8 years ago)

Author:

vboxsync

Message:

Dev/E1000: (bugref:8624) Removed link-up delay

File:

• trunk/src/VBox/Devices/Network/DevE1000.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Network/DevE1000.cpp

@@ -70 +70 @@
  * in init (see @bugref{8624}).
  */
-#define E1K_INIT_LINKUP_DELAY (500 * 1000)
+//#define E1K_INIT_LINKUP_DELAY (500 * 1000)
 /** @def E1K_IMS_INT_DELAY_NS
  * E1K_IMS_INT_DELAY_NS prevents interrupt storms in Windows guests on enabling
@@ -2678 +2678 @@
             && !(STATUS & STATUS_LU))
         {
+#ifdef E1K_INIT_LINKUP_DELAY
             /*
              * The driver indicates that we should bring up the link. Our default 5-second delay is too long,
              * as Linux guests detect Tx hang after 2 seconds. Let's use 500 ms delay instead. */
             e1kArmTimer(pThis, pThis->CTX_SUFF(pLUTimer), E1K_INIT_LINKUP_DELAY);
+#else /* !E1K_INIT_LINKUP_DELAY */
+            /* Bring up the link immediately, no need for an interrupt though. */
+            STATUS |= STATUS_LU;
+            Phy::setLinkStatus(&pThis->phy, true);
+#endif /* !E1K_INIT_LINKUP_DELAY */
         }
         if (value & CTRL_VME)