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
Cc: Bin Meng <bmeng.cn@gmail.com>
Subject: [PATCH v2 11/13] hw/net: rtl8139: Remove the logic of padding short frames in the receive path
Date: Mon, 15 Mar 2021 15:57:16 +0800 [thread overview]
Message-ID: <20210315075718.5402-12-bmeng.cn@gmail.com> (raw)
In-Reply-To: <20210315075718.5402-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.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---
hw/net/rtl8139.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index 4675ac878e..cbfe29a286 100644
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -827,7 +827,6 @@ static ssize_t rtl8139_do_receive(NetClientState *nc, const uint8_t *buf, size_t
uint32_t packet_header = 0;
- uint8_t buf1[MIN_BUF_SIZE + VLAN_HLEN];
static const uint8_t broadcast_macaddr[6] =
{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
@@ -939,17 +938,6 @@ static ssize_t rtl8139_do_receive(NetClientState *nc, const uint8_t *buf, size_t
}
}
- /* if too small buffer, then expand it
- * Include some tailroom in case a vlan tag is later removed. */
- if (size < MIN_BUF_SIZE + VLAN_HLEN) {
- memcpy(buf1, buf, size);
- memset(buf1 + size, 0, MIN_BUF_SIZE + VLAN_HLEN - size);
- buf = buf1;
- if (size < MIN_BUF_SIZE) {
- size = MIN_BUF_SIZE;
- }
- }
-
if (rtl8139_cp_receiver_enabled(s))
{
if (!rtl8139_cp_rx_valid(s)) {
--
2.25.1
next prev parent reply other threads:[~2021-03-15 8:06 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-15 7:57 [PATCH v2 00/13] net: Pad short frames for network backends Bin Meng
2021-03-15 7:57 ` [PATCH v2 01/13] net: Add ETH_ZLEN define in eth.h Bin Meng
2021-03-15 9:13 ` Philippe Mathieu-Daudé
2021-03-15 10:15 ` Bin Meng
2021-03-15 10:24 ` Philippe Mathieu-Daudé
2021-03-15 7:57 ` [PATCH v2 02/13] net: Add a 'do_not_pad" to NetClientState Bin Meng
2021-03-15 9:17 ` Philippe Mathieu-Daudé
2021-03-15 9:18 ` Philippe Mathieu-Daudé
2021-03-15 9:22 ` Philippe Mathieu-Daudé
2021-03-15 10:17 ` Bin Meng
2021-03-15 10:21 ` Peter Maydell
2021-03-15 7:57 ` [PATCH v2 03/13] net: slirp: Pad short frames to minimum size before send Bin Meng
2021-03-16 2:25 ` Jason Wang
2021-03-15 7:57 ` [PATCH v2 04/13] net: tap: " Bin Meng
2021-03-15 7:57 ` [PATCH v2 05/13] hw/net: virtio-net: Initialize nc->do_not_pad to true Bin Meng
2021-03-15 7:57 ` [PATCH v2 06/13] hw/net: e1000: Remove the logic of padding short frames in the receive path Bin Meng
2021-03-15 7:57 ` [PATCH v2 07/13] hw/net: vmxnet3: " Bin Meng
2021-03-15 7:57 ` [PATCH v2 08/13] hw/net: i82596: " Bin Meng
2021-03-15 7:57 ` [PATCH v2 09/13] hw/net: ne2000: " Bin Meng
2021-03-15 7:57 ` [PATCH v2 10/13] hw/net: pcnet: " Bin Meng
2021-03-15 7:57 ` Bin Meng [this message]
2021-03-15 7:57 ` [PATCH v2 12/13] hw/net: sungem: " Bin Meng
2021-03-15 7:57 ` [PATCH v2 13/13] hw/net: sunhme: " 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=20210315075718.5402-12-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).