From: Bin Meng <bmeng.cn@gmail.com>
To: "Jason Wang" <jasowang@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
qemu-devel@nongnu.org
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 [thread overview]
Message-ID: <20210317062638.72626-6-bmeng.cn@gmail.com> (raw)
In-Reply-To: <20210317062638.72626-1-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>
---
(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
next prev parent reply other threads:[~2021-03-17 6:50 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-17 6:26 [PATCH v5 00/12] net: Pad short frames for network backends Bin Meng
2021-03-17 6:26 ` [PATCH v5 01/12] net: eth: Add a helper to pad a short Ethernet frame Bin Meng
2021-03-17 6:26 ` [PATCH v5 02/12] net: Add a 'do_not_pad" to NetClientState Bin Meng
2021-03-17 6:26 ` [PATCH v5 03/12] net: Pad short frames to minimum size before sending from SLiRP/TAP Bin Meng
2021-03-17 6:26 ` [PATCH v5 04/12] hw/net: virtio-net: Initialize nc->do_not_pad to true Bin Meng
2021-03-17 6:26 ` Bin Meng [this message]
2021-03-17 6:26 ` [PATCH v5 06/12] hw/net: vmxnet3: Remove the logic of padding short frames in the receive path Bin Meng
2021-03-17 6:26 ` [PATCH v5 07/12] hw/net: i82596: " Bin Meng
2021-03-17 6:26 ` [PATCH v5 08/12] hw/net: ne2000: " Bin Meng
2021-03-17 6:26 ` [PATCH v5 09/12] hw/net: pcnet: " Bin Meng
2021-03-17 6:26 ` [PATCH v5 10/12] hw/net: rtl8139: " Bin Meng
2021-03-17 6:26 ` [PATCH v5 11/12] hw/net: sungem: " Bin Meng
2021-03-17 6:26 ` [PATCH v5 12/12] hw/net: sunhme: " Bin Meng
2021-03-22 1:28 ` [PATCH v5 00/12] net: Pad short frames for network backends Bin Meng
2021-03-22 7:08 ` Jason Wang
2021-05-14 5:10 ` Bin Meng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210317062638.72626-6-bmeng.cn@gmail.com \
--to=bmeng.cn@gmail.com \
--cc=jasowang@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).