[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 05/12] hw/net: e1000: Remove the logic of padding short frames
From: |
Bin Meng |
Subject: |
[PATCH v5 05/12] hw/net: e1000: Remove the logic of padding short frames in the receive path |
Date: |
Wed, 17 Mar 2021 14:26:31 +0800 |
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>
---
(no changes since v1)
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 4f75b44cfc..4587b28176 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -886,7 +886,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;
@@ -902,15 +901,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.17.1
- [PATCH v5 00/12] net: Pad short frames for network backends, Bin Meng, 2021/03/17
- [PATCH v5 01/12] net: eth: Add a helper to pad a short Ethernet frame, Bin Meng, 2021/03/17
- [PATCH v5 02/12] net: Add a 'do_not_pad" to NetClientState, Bin Meng, 2021/03/17
- [PATCH v5 03/12] net: Pad short frames to minimum size before sending from SLiRP/TAP, Bin Meng, 2021/03/17
- [PATCH v5 04/12] hw/net: virtio-net: Initialize nc->do_not_pad to true, Bin Meng, 2021/03/17
- [PATCH v5 05/12] hw/net: e1000: Remove the logic of padding short frames in the receive path,
Bin Meng <=
- [PATCH v5 06/12] hw/net: vmxnet3: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/17
- [PATCH v5 08/12] hw/net: ne2000: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/17
- [PATCH v5 07/12] hw/net: i82596: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/17
- [PATCH v5 09/12] hw/net: pcnet: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/17
- [PATCH v5 10/12] hw/net: rtl8139: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/17
- [PATCH v5 11/12] hw/net: sungem: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/17
- [PATCH v5 12/12] hw/net: sunhme: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/17
- Re: [PATCH v5 00/12] net: Pad short frames for network backends, Bin Meng, 2021/03/21
- Re: [PATCH v5 00/12] net: Pad short frames for network backends, Jason Wang, 2021/03/22