[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v3 03/10] hw/net: e1000: Remove the logic of padding short fr
From: |
Philippe Mathieu-Daudé |
Subject: |
[RFC PATCH v3 03/10] hw/net: e1000: Remove the logic of padding short frames in the receive path |
Date: |
Wed, 3 Mar 2021 20:11:58 +0100 |
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>
Message-Id: <1614763306-18026-3-git-send-email-bmeng.cn@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
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 d8da2f6528b..a53ba9052b4 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.26.2
- Re: [RFC PATCH v3 02/10] net: Pad short frames to minimum size before send from SLiRP/TAP, (continued)
- Re: [RFC PATCH v3 02/10] net: Pad short frames to minimum size before send from SLiRP/TAP, Bin Meng, 2021/03/11
- Re: [RFC PATCH v3 02/10] net: Pad short frames to minimum size before send from SLiRP/TAP, Peter Maydell, 2021/03/11
- Re: [RFC PATCH v3 02/10] net: Pad short frames to minimum size before send from SLiRP/TAP, Bin Meng, 2021/03/11
- Re: [RFC PATCH v3 02/10] net: Pad short frames to minimum size before send from SLiRP/TAP, Peter Maydell, 2021/03/11
- Re: [RFC PATCH v3 02/10] net: Pad short frames to minimum size before send from SLiRP/TAP, Bin Meng, 2021/03/11
- Re: [RFC PATCH v3 02/10] net: Pad short frames to minimum size before send from SLiRP/TAP, Jason Wang, 2021/03/12
- Re: [RFC PATCH v3 02/10] net: Pad short frames to minimum size before send from SLiRP/TAP, Bin Meng, 2021/03/12
- Re: [RFC PATCH v3 02/10] net: Pad short frames to minimum size before send from SLiRP/TAP, Jason Wang, 2021/03/12
- Re: [RFC PATCH v3 02/10] net: Pad short frames to minimum size before send from SLiRP/TAP, Bin Meng, 2021/03/12
- Re: [RFC PATCH v3 02/10] net: Pad short frames to minimum size before send from SLiRP/TAP, Jason Wang, 2021/03/12
[RFC PATCH v3 03/10] hw/net: e1000: Remove the logic of padding short frames in the receive path,
Philippe Mathieu-Daudé <=
[RFC PATCH v3 04/10] hw/net: vmxnet3: Remove the logic of padding short frames in the receive path, Philippe Mathieu-Daudé, 2021/03/03
[RFC PATCH v3 05/10] hw/net: i82596: Remove the logic of padding short frames in the receive path, Philippe Mathieu-Daudé, 2021/03/03
[RFC PATCH v3 06/10] hw/net: ne2000: Remove the logic of padding short frames in the receive path, Philippe Mathieu-Daudé, 2021/03/03
[RFC PATCH v3 07/10] hw/net: pcnet: Remove the logic of padding short frames in the receive path, Philippe Mathieu-Daudé, 2021/03/03
[RFC PATCH v3 08/10] hw/net: rtl8139: Remove the logic of padding short frames in the receive path, Philippe Mathieu-Daudé, 2021/03/03
[RFC PATCH v3 10/10] hw/net: sunhme: Remove the logic of padding short frames in the receive path, Philippe Mathieu-Daudé, 2021/03/03
[RFC PATCH v3 09/10] hw/net: sungem: Remove the logic of padding short frames in the receive path, Philippe Mathieu-Daudé, 2021/03/03
Re: [RFC PATCH v3 00/10] net: Handle short frames for SLiRP/TAP interfaces, Bin Meng, 2021/03/07