[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 1/8] hw/net: e1000: Remove the logic of padding short frames i
From: |
bmeng . cn |
Subject: |
[PATCH v6 1/8] hw/net: e1000: Remove the logic of padding short frames in the receive path |
Date: |
Wed, 1 Mar 2023 17:01:56 +0800 |
From: Bin Meng <bmeng.cn@gmail.com>
Now that we have implemented unified short frames padding in the
QEMU networking codes, remove the same logic in the NIC codes.
This actually reverts commit 78aeb23eded2d0b765bf9145c71f80025b568acd.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Bin Meng <bmeng@tinylab.org>
---
hw/net/e1000.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index 7efb8a4c52..d9637cbc6d 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -908,7 +908,6 @@ e1000_receive_iov(NetClientState *nc, const struct iovec
*iov, int iovcnt)
uint16_t vlan_special = 0;
uint8_t vlan_status = 0;
uint8_t min_buf[MIN_BUF_SIZE];
- struct iovec min_iov;
uint8_t *filter_buf = iov->iov_base;
size_t size = iov_size(iov, iovcnt);
size_t iov_ofs = 0;
@@ -924,15 +923,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;
--
2.34.1
- [PATCH v6 0/8] net: Pad short frames for network backends, bmeng . cn, 2023/03/01
- [PATCH v6 1/8] hw/net: e1000: Remove the logic of padding short frames in the receive path,
bmeng . cn <=
- [PATCH v6 2/8] hw/net: vmxnet3: Remove the logic of padding short frames in the receive path, bmeng . cn, 2023/03/01
- [PATCH v6 6/8] hw/net: rtl8139: Remove the logic of padding short frames in the receive path, bmeng . cn, 2023/03/01
- [PATCH v6 7/8] hw/net: sungem: Remove the logic of padding short frames in the receive path, bmeng . cn, 2023/03/01
- [PATCH v6 3/8] hw/net: i82596: Remove the logic of padding short frames in the receive path, bmeng . cn, 2023/03/01
- [PATCH v6 4/8] hw/net: ne2000: Remove the logic of padding short frames in the receive path, bmeng . cn, 2023/03/01
- [PATCH v6 5/8] hw/net: pcnet: Remove the logic of padding short frames in the receive path, bmeng . cn, 2023/03/01
- [PATCH v6 8/8] hw/net: sunhme: Remove the logic of padding short frames in the receive path, bmeng . cn, 2023/03/01
- Re: [PATCH v6 0/8] net: Pad short frames for network backends, Cédric Le Goater, 2023/03/01