[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v2 2/9] hw/net: e1000: Remove the logic of padding short fram
From: |
Bin Meng |
Subject: |
[RFC PATCH v2 2/9] hw/net: e1000: Remove the logic of padding short frames in the receive path |
Date: |
Wed, 3 Mar 2021 17:21:39 +0800 |
From: Bin Meng <bin.meng@windriver.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 <bin.meng@windriver.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 d8da2f6..a53ba90 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -882,7 +882,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;
@@ -898,15 +897,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.7.4
- [RFC PATCH v2 0/9] net: Handle short frames for SLiRP/TAP interfaces, Bin Meng, 2021/03/03
- [RFC PATCH v2 1/9] net: Pad short frames to minimum size before send from SLiRP/TAP, Bin Meng, 2021/03/03
- [RFC PATCH v2 2/9] hw/net: e1000: Remove the logic of padding short frames in the receive path,
Bin Meng <=
- [RFC PATCH v2 3/9] hw/net: vmxnet3: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/03
- [RFC PATCH v2 4/9] hw/net: i82596: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/03
- [RFC PATCH v2 5/9] hw/net: ne2000: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/03
- [RFC PATCH v2 6/9] hw/net: pcnet: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/03
- [RFC PATCH v2 7/9] hw/net: rtl8139: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/03
- [RFC PATCH v2 8/9] hw/net: sungem: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/03
- [RFC PATCH v2 9/9] hw/net: sunhme: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/03