Changeset 29439 in vbox

Timestamp:

May 13, 2010 12:32:18 AM (15 years ago)

Author:

vboxsync

Message:

DevE1000: Fixed bug in e1kRegWriteRCTL wrt calculating and updating u16RxBSize. The calculation was done using the old register value and RCTL.BSEX was ignored when checking whether an update was necessary.

File:

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

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

@@ -2579 +2579 @@
 #endif
     }
+
     /* Adjust receive buffer size */
-    if (GET_BITS(RCTL, BSIZE) != GET_BITS_V(value, RCTL, BSIZE))
-    {
-        pState->u16RxBSize = 2048 >> GET_BITS(RCTL, BSIZE);
-        if (RCTL & RCTL_BSEX)
-            pState->u16RxBSize *= 16;
-        E1kLog2(("%s e1kRegWriteRCTL: Setting receive buffer size to %d\n",
-                 INSTANCE(pState), pState->u16RxBSize));
-    }
+    unsigned cbRxBuf = 2048 >> GET_BITS_V(value, RCTL, BSIZE);
+    if (value & RCTL_BSEX)
+        cbRxBuf *= 16;
+    if (cbRxBuf != pState->u16RxBSize)
+        E1kLog2(("%s e1kRegWriteRCTL: Setting receive buffer size to %d (old %d)\n",
+                 INSTANCE(pState), cbRxBuf, pState->u16RxBSize));
+    pState->u16RxBSize = cbRxBuf;
+
+    /* Update the register */
     e1kRegWriteDefault(pState, offset, index, value);