Changeset 40799 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 6, 2012 4:52:54 PM (13 years ago)

Author:

vboxsync

Message:

e1000: Handle packets with unstripped Ethernet CRC (#6152)

File:

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

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

@@ -2027 +2027 @@
     Assert(cb <= E1K_MAX_RX_PKT_SIZE);
     Assert(cb > 16);
+    size_t cbMax = ((RCTL & RCTL_LPE) ? E1K_MAX_RX_PKT_SIZE - 4 : 1518) - (status.fVP ? 0 : 4);
+    E1kLog3(("%s Max RX packet size is %u\n", INSTANCE(pState), cbMax));
     if (status.fVP)
     {
@@ -2051 +2053 @@
         cb = 60;
     }
-    if (!(RCTL & RCTL_SECRC))
+    if (!(RCTL & RCTL_SECRC) && cb <= cbMax)
     {
         STAM_PROFILE_ADV_START(&pState->StatReceiveCRC, a);
@@ -2063 +2065 @@
         cb += sizeof(uint32_t);
         STAM_PROFILE_ADV_STOP(&pState->StatReceiveCRC, a);
+        E1kLog3(("%s Added FCS (cb=%u)\n", INSTANCE(pState), cb));
     }
     /* Compute checksum of complete packet */