Changeset 39367 in vbox

Timestamp:

Nov 18, 2011 2:16:57 PM (13 years ago)

Author:

vboxsync

Message:

e1000: frame size and fallback buffer allocation fixes (#4806)

File:

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

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

@@ -3192 +3192 @@
 {
     PPDMSCATTERGATHER   pSg     = pState->CTX_SUFF(pTxSg);
-    uint32_t const      cbFrame = pSg ? ((uint32_t)pSg->cbUsed + (pState->fVTag ? 4 : 0)) : 0;
+    uint32_t            cbFrame = pSg ? (uint32_t)pSg->cbUsed : 0;
     Assert(!pSg || pSg->cSegs == 1);
 
+    if (cbFrame > 70) /* unqualified guess */
+        pState->led.Asserted.s.fWriting = pState->led.Actual.s.fWriting = 1;
+
+    /* Add VLAN tag */
+    if (cbFrame > 12 && pState->fVTag)
+    {
+        E1kLog3(("%s Inserting VLAN tag %08x\n",
+            INSTANCE(pState), RT_BE2H_U16(VET) | (RT_BE2H_U16(pState->u16VTagTCI) << 16)));
+        memmove((uint8_t*)pSg->aSegs[0].pvSeg + 16, (uint8_t*)pSg->aSegs[0].pvSeg + 12, cbFrame - 12);
+        *((uint32_t*)pSg->aSegs[0].pvSeg + 3) = RT_BE2H_U16(VET) | (RT_BE2H_U16(pState->u16VTagTCI) << 16);
+        pSg->cbUsed += 4;
+        cbFrame     += 4;
+        Assert(pSg->cbUsed == cbFrame);
+        Assert(pSg->cbUsed <= pSg->cbAvailable);
+    }
 /*    E1kLog2(("%s <<< Outgoing packet. Dump follows: >>>\n"
             "%.*Rhxd\n"
@@ -3200 +3215 @@
             INSTANCE(pState), cbFrame, pSg->aSegs[0].pvSeg, INSTANCE(pState)));*/
 
-    if (cbFrame > 70) /* unqualified guess */
-        pState->led.Asserted.s.fWriting = pState->led.Actual.s.fWriting = 1;
-
-    /* Add VLAN tag */
-    if (cbFrame > 16 && pState->fVTag)
-    {
-        E1kLog3(("%s Inserting VLAN tag %08x\n",
-            INSTANCE(pState), RT_BE2H_U16(VET) | (RT_BE2H_U16(pState->u16VTagTCI) << 16)));
-        memmove((uint8_t*)pSg->aSegs[0].pvSeg + 16, (uint8_t*)pSg->aSegs[0].pvSeg + 12, cbFrame - 12);
-        *((uint32_t*)pSg->aSegs[0].pvSeg + 3) = RT_BE2H_U16(VET) | (RT_BE2H_U16(pState->u16VTagTCI) << 16);
-    }
     /* Update the stats */
     E1K_INC_CNT32(TPT);
@@ -3417 +3421 @@
          */
         if (!pState->CTX_SUFF(pTxSg))
-            e1kXmitAllocBuf(pState, pState->u16TxPktLen, true /*fExactSize*/, false /*fGso*/);
+            e1kXmitAllocBuf(pState, pState->u16TxPktLen + (pState->fVTag ? 4 : 0), true /*fExactSize*/, false /*fGso*/);
         if (pState->CTX_SUFF(pTxSg))
         {