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

Timestamp:

Oct 6, 2017 12:12:04 PM (8 years ago)

Author:

vboxsync

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

118270

Message:

Dev/E1000: (bugref:8942) SLU write no longer triggers delayed LSC (reset does). No LSC on timer expiration if SLU is not set (except 82543GC).

File:

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

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

@@ -2702 +2702 @@
     else
     {
+#ifdef E1K_LSC_ON_SLU
         /*
          * When the guest changes 'Set Link Up' bit from 0 to 1 we check if
@@ -2715 +2716 @@
             e1kArmTimer(pThis, pThis->CTX_SUFF(pLUTimer), E1K_INIT_LINKUP_DELAY_US);
         }
+#endif /* E1K_LSC_ON_SLU */
         if ((value & CTRL_VME) != (CTRL & CTRL_VME))
         {
@@ -3435 +3437 @@
      */
     if (pThis->fCableConnected)
-        e1kR3LinkUp(pThis);
+    {
+        /* 82543GC does not have an internal PHY */
+        if (pThis->eChip == E1K_CHIP_82543GC || (CTRL & CTRL_SLU))
+            e1kR3LinkUp(pThis);
+    }
 #ifdef E1K_LSC_ON_RESET
     else if (pThis->eChip == E1K_CHIP_82543GC)