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

Timestamp:

Nov 2, 2016 9:25:09 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

111663

Message:

Dev/E1000: (bugref:8624) Shorter (100ms) delay for bringing up the link during init, which fixes Linux guests

File:

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

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

@@ -66 +66 @@
  */
 #define E1K_LSC_ON_SLU
+/** @def E1K_INIT_LINKUP_DELAY
+ * E1K_INIT_LINKUP_DELAY prevents the link going up while the driver is still
+ * in init (see @bugref{8624}).
+ */
+#define E1K_INIT_LINKUP_DELAY (100 * 1000)
 /** @def E1K_TX_DELAY
  * E1K_TX_DELAY aims to improve guest-host transfer rate for TCP streams by
@@ -2668 +2673 @@
             && !(STATUS & STATUS_LU))
         {
-            /* The driver indicates that we should bring up the link */
-            /* Do so in 5 seconds (by default). */
-            e1kBringLinkUpDelayed(pThis);
+            /*
+             * 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 100 ms delay instead. */
+            e1kArmTimer(pThis, pThis->CTX_SUFF(pLUTimer), E1K_INIT_LINKUP_DELAY);
         }
         if (value & CTRL_VME)