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

Timestamp:

Dec 23, 2010 8:40:52 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

69166

Message:

e1000: PXE boot fixes for WDS and other pipelined TFTP servers.

File:

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

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

@@ -1862 +1862 @@
         e1kRaiseInterrupt(pState, VERR_SEM_BUSY, ICR_RXDMT0);
     }
+    E1kLog2(("%s e1kAdvanceRDH: at exit RDH=%x RDT=%x len=%x\n",
+             INSTANCE(pState), RDH, RDT, uRQueueLen));
     //e1kCsLeave(pState);
 }
@@ -4650 +4652 @@
         return VERR_NET_NO_BUFFER_SPACE;
 
-    if (RDH < RDT)
+    if (RT_UNLIKELY(RDLEN == sizeof(E1KRXDESC)))
+    {
+        E1KRXDESC desc;
+        PDMDevHlpPhysRead(pState->CTX_SUFF(pDevIns), e1kDescAddr(RDBAH, RDBAL, RDH),
+                          &desc, sizeof(desc));
+        if (desc.status.fDD)
+            cb = 0;
+        else
+            cb = pState->u16RxBSize;
+    }
+    else if (RDH < RDT)
         cb = (RDT - RDH) * pState->u16RxBSize;
     else if (RDH > RDT)
@@ -4659 +4671 @@
         E1kLogRel(("E1000: OUT of RX descriptors!\n"));
     }
+    E1kLog2(("%s e1kCanReceive: at exit RDH=%d RDT=%d RDLEN=%d u16RxBSize=%d cb=%lu\n",
+             INSTANCE(pState), RDH, RDT, RDLEN, pState->u16RxBSize, cb));
 
     e1kCsRxLeave(pState);