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

Timestamp:

Nov 17, 2011 9:27:04 PM (13 years ago)

Author:

vboxsync

Message:

e1000: reverted r74918

File:

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

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

@@ -3206 +3206 @@
     if (cbFrame > 16 && pState->fVTag)
     {
-        /*
-         * We should have 'adjusted' pvSeg earlier to make room for four
-         * additional bytes at the beginning of buffer. Now we move it back.
-         */
-        uint32_t *pSrc = (uint32_t*)pSg->aSegs[0].pvSeg;
-        uint32_t *pDst = pSrc - 1;
-        pSg->aSegs[0].pvSeg = pDst;
-        *pDst++ = *pSrc++; /* Copy destination address */
-        *pDst++ = *pSrc++; /* Copy destination and source addresses */
-        *pDst++ = *pSrc++; /* Copy source address */
-        *pDst++ = RT_BE2H_U16(VET) | (RT_BE2H_U16(pState->u16VTagTCI) << 16);
-        E1kLog3(("%s Inserted VLAN tag %08x\n",
+        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 */
@@ -3743 +3734 @@
                 /** @todo Is there any way to indicating errors other than collisions? Like
                  *        VERR_NET_DOWN. */
-                /*
-                 * If allocate a bigger buffer we need to move pvSeg
-                 * accordingly, leaving room in front.
-                 *
-                 * Note that e1kTransmitFrame not necessarily moves it back. In
-                 * case of multi-descriptor packet with TSE we won't know if
-                 * VLAN tag has to be inserted until the last descriptor is
-                 * fetched. If it has not we simply leave pvSeg as it is (+4)
-                 * and send the packet without inserting VLAN tag.
-                 */
-                if (cbVTag)
-                {
-                    Assert(cbVTag == 4);
-                    pState->CTX_SUFF(pTxSg)->aSegs[0].pvSeg =
-                        (uint8_t*)(pState->CTX_SUFF(pTxSg)->aSegs[0].pvSeg) + cbVTag;
-                }
             }
 
@@ -3849 +3824 @@
                 /** @todo Is there any way to indicating errors other than collisions? Like
                  *        VERR_NET_DOWN. */
-                /*
-                 * If allocate a bigger buffer we need to move pvSeg
-                 * accordingly, leaving room in front. Also see the comment
-                 * in data descriptor processing.
-                 */
-                if (cbVTag)
-                {
-                    Assert(cbVTag == 4);
-                    pState->CTX_SUFF(pTxSg)->aSegs[0].pvSeg =
-                        (uint8_t*)(pState->CTX_SUFF(pTxSg)->aSegs[0].pvSeg) + cbVTag;
-                }
             }