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

Timestamp:

Jun 19, 2009 9:04:22 AM (16 years ago)

Author:

vboxsync

Message:

DevPCNet.cpp: link down in function as I said.

File:

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

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

@@ -4210 +4210 @@
 
 /**
+ * Takes down the link temporarily if it's current status is up.
+ *
+ * This is used during restore and when replumbing the network link.
+ *
+ * The temporary link outage is supposed to indicate to the OS that all network
+ * connections have been lost and that it for instance is appropriate to
+ * renegotiate any DHCP lease.
+ *
+ * @param  pThis        The PCNet instance data.
+ */
+static void pcnetTempLinkDown(PCNetState *pThis)
+{
+    if (pThis->fLinkUp)
+    {
+        pThis->fLinkTempDown = true;
+        pThis->cLinkDownReported = 0;
+        pThis->aCSR[0] |= RT_BIT(15) | RT_BIT(13); /* ERR | CERR (this is probably wrong) */
+        pThis->Led.Asserted.s.fError = pThis->Led.Actual.s.fError = 1;
+        int rc = TMTimerSetMillies(pThis->pTimerRestore, 5000);
+        AssertRC(rc);
+    }
+}
+
+
+/**
  * Serializes the receive thread, it may be working inside the critsect.
  *
@@ -4361 +4386 @@
 #endif
     /* Indicate link down to the guest OS that all network connections have been lost. */
-    if (pThis->fLinkUp)
-    {
-        pThis->fLinkTempDown = true;
-        pThis->cLinkDownReported = 0;
-        pThis->aCSR[0] |= RT_BIT(15) | RT_BIT(13); /* ERR | CERR (this is probably wrong) */
-        pThis->Led.Asserted.s.fError = pThis->Led.Actual.s.fError = 1;
-        return TMTimerSetMillies(pThis->pTimerRestore, 5000);
-    }
+    pcnetTempLinkDown(pThis);
+
     return VINF_SUCCESS;
 }
@@ -4735 +4754 @@
      * network card
      */
-    if (pThis->fLinkUp && RT_SUCCESS(rc))
-    {
-        pThis->fLinkTempDown = true;
-        pThis->cLinkDownReported = 0;
-        pThis->aCSR[0] |= RT_BIT(15) | RT_BIT(13); /* ERR | CERR (this is probably wrong) */
-        pThis->Led.Asserted.s.fError = pThis->Led.Actual.s.fError = 1;
-        TMTimerSetMillies(pThis->pTimerRestore, 5000);
-    }
+    if (RT_SUCCESS(rc))
+        pcnetTempLinkDown(pThis);
 
     PDMCritSectLeave(&pThis->CritSect);