diff mbox series

[RFC,2/3] Revert "e1000: Pad short frames to minimum size (60 bytes)"

Message ID 1614333786-74258-3-git-send-email-bmeng.cn@gmail.com
State Superseded
Headers show
Series net: Pad short frames to minimum size (60 bytes) | expand

Commit Message

Bin Meng Feb. 26, 2021, 10:03 a.m. UTC 
From: Bin Meng <bin.meng@windriver.com>

This reverts commit 78aeb23eded2d0b765bf9145c71f80025b568acd.

The short frames padding is now handled in the QEMU networking codes.
Revert this workaround in e1000.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
---

 hw/net/e1000.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index d8da2f6..8edc2e7 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -898,15 +898,7 @@  e1000_receive_iov(NetClientState *nc, const struct iovec *iov, int iovcnt)
         return 0;
     }
 
-    /* Pad to minimum Ethernet frame length */
-    if (size < sizeof(min_buf)) {
-        iov_to_buf(iov, iovcnt, 0, min_buf, size);
-        memset(&min_buf[size], 0, sizeof(min_buf) - size);
-        min_iov.iov_base = filter_buf = min_buf;
-        min_iov.iov_len = size = sizeof(min_buf);
-        iovcnt = 1;
-        iov = &min_iov;
-    } else if (iov->iov_len < MAXIMUM_ETHERNET_HDR_LEN) {
+    if (iov->iov_len < MAXIMUM_ETHERNET_HDR_LEN) {
         /* This is very unlikely, but may happen. */
         iov_to_buf(iov, iovcnt, 0, min_buf, MAXIMUM_ETHERNET_HDR_LEN);
         filter_buf = min_buf;