Changeset 18118 in vbox for trunk/src

Timestamp:

Mar 20, 2009 1:43:11 PM (16 years ago)

Author:

vboxsync

Message:

E1000: properly connect/disconnect if the link status changes

File:

• trunk/src/VBox/Devices/Network/DevE1000.cpp (modified) (1 diff)

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

@@ -4271 +4271 @@
 {
     E1KSTATE *pState = IFACE_TO_STATE(pInterface, INetworkConfig);
-    switch (enmState)
-    {
-        case PDMNETWORKLINKSTATE_UP:
+    bool fOldUp = !!(STATUS & STATUS_LU);
+    bool fNewUp = enmState == PDMNETWORKLINKSTATE_UP;
+
+    if (fNewUp != fOldUp)
+    {
+        if (fNewUp)
+        {
             E1kLog(("%s Link is up\n", INSTANCE(pState)));
             STATUS |= STATUS_LU;
             Phy::setLinkStatus(&pState->phy, true);
-            break;
-        case PDMNETWORKLINKSTATE_DOWN:
+        }
+        else
+        {
             E1kLog(("%s Link is down\n", INSTANCE(pState)));
             STATUS &= ~STATUS_LU;
             Phy::setLinkStatus(&pState->phy, false);
-            break;
-        case PDMNETWORKLINKSTATE_DOWN_RESUME:
-            /// @todo I failed to locate any references to this state,
-            /// looks like it is never used.
-            E1kLog(("%s Link is down temporarely\n", INSTANCE(pState)));
-            STATUS &= ~STATUS_LU;
-            Phy::setLinkStatus(&pState->phy, false);
-            break;
-        default:
-            E1kLog(("%s Invalid link state: %d\n", INSTANCE(pState), enmState));
-            return VERR_INVALID_PARAMETER;
-    }
-    e1kRaiseInterrupt(pState, VERR_SEM_BUSY, ICR_LSC);
+        }
+        e1kRaiseInterrupt(pState, VERR_SEM_BUSY, ICR_LSC);
+        if (pState->pDrv)
+            pState->pDrv->pfnNotifyLinkChanged(pState->pDrv, enmState);
+    }
     return VINF_SUCCESS;
 }