From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Dmitry Fleytman" <dmitry.fleytman@gmail.com>,
"Jason Wang" <jasowang@redhat.com>,
"Bin Meng" <bin.meng@windriver.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Bin Meng" <bmeng.cn@gmail.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [RFC PATCH v3 07/10] hw/net: pcnet: Remove the logic of padding short frames in the receive path
Date: Wed, 3 Mar 2021 20:12:02 +0100 [thread overview]
Message-ID: <20210303191205.1656980-8-philmd@redhat.com> (raw)
In-Reply-To: <20210303191205.1656980-1-philmd@redhat.com>
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.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Message-Id: <1614763306-18026-7-git-send-email-bmeng.cn@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/net/pcnet.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
index f3f18d8598c..16330335cd2 100644
--- a/hw/net/pcnet.c
+++ b/hw/net/pcnet.c
@@ -987,7 +987,6 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
{
PCNetState *s = qemu_get_nic_opaque(nc);
int is_padr = 0, is_bcast = 0, is_ladr = 0;
- uint8_t buf1[60];
int remaining;
int crc_err = 0;
size_t size = size_;
@@ -1000,14 +999,6 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
printf("pcnet_receive size=%zu\n", size);
#endif
- /* if too small buffer, then expand it */
- if (size < MIN_BUF_SIZE) {
- memcpy(buf1, buf, size);
- memset(buf1 + size, 0, MIN_BUF_SIZE - size);
- buf = buf1;
- size = MIN_BUF_SIZE;
- }
-
if (CSR_PROM(s)
|| (is_padr=padr_match(s, buf, size))
|| (is_bcast=padr_bcast(s, buf, size))
--
2.26.2
next prev parent reply other threads:[~2021-03-03 19:18 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-03 19:11 [RFC PATCH v3 00/10] net: Handle short frames for SLiRP/TAP interfaces Philippe Mathieu-Daudé
2021-03-03 19:11 ` [RFC PATCH v3 01/10] net: Use 'struct iovec' in qemu_send_packet_async_with_flags() Philippe Mathieu-Daudé
2021-03-03 19:11 ` [RFC PATCH v3 02/10] net: Pad short frames to minimum size before send from SLiRP/TAP Philippe Mathieu-Daudé
2021-03-08 3:48 ` Jason Wang
2021-03-08 4:12 ` Bin Meng
2021-03-08 10:22 ` Peter Maydell
2021-03-09 8:23 ` Jason Wang
2021-03-09 8:35 ` Bin Meng
2021-03-09 8:57 ` Jason Wang
2021-03-09 9:00 ` Bin Meng
2021-03-09 9:01 ` Bin Meng
2021-03-09 10:13 ` Peter Maydell
2021-03-09 10:17 ` Bin Meng
2021-03-09 12:30 ` Yan Vugenfirer
2021-03-09 12:33 ` Bin Meng
2021-03-12 6:25 ` Jason Wang
2021-03-11 3:01 ` Jason Wang
2021-03-11 3:12 ` Bin Meng
2021-03-11 3:33 ` Jason Wang
2021-03-11 7:35 ` Bin Meng
2021-03-11 9:43 ` Peter Maydell
2021-03-11 9:58 ` Bin Meng
2021-03-11 10:22 ` Peter Maydell
2021-03-11 10:27 ` Bin Meng
2021-03-12 6:22 ` Jason Wang
2021-03-12 6:28 ` Bin Meng
2021-03-12 6:50 ` Jason Wang
2021-03-12 6:53 ` Bin Meng
2021-03-12 7:02 ` Jason Wang
2021-03-03 19:11 ` [RFC PATCH v3 03/10] hw/net: e1000: Remove the logic of padding short frames in the receive path Philippe Mathieu-Daudé
2021-03-03 19:11 ` [RFC PATCH v3 04/10] hw/net: vmxnet3: " Philippe Mathieu-Daudé
2021-03-03 19:12 ` [RFC PATCH v3 05/10] hw/net: i82596: " Philippe Mathieu-Daudé
2021-03-03 19:12 ` [RFC PATCH v3 06/10] hw/net: ne2000: " Philippe Mathieu-Daudé
2021-03-03 19:12 ` Philippe Mathieu-Daudé [this message]
2021-03-03 19:12 ` [RFC PATCH v3 08/10] hw/net: rtl8139: " Philippe Mathieu-Daudé
2021-03-03 19:12 ` [RFC PATCH v3 09/10] hw/net: sungem: " Philippe Mathieu-Daudé
2021-03-03 19:12 ` [RFC PATCH v3 10/10] hw/net: sunhme: " Philippe Mathieu-Daudé
2021-03-08 1:51 ` [RFC PATCH v3 00/10] net: Handle short frames for SLiRP/TAP interfaces 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=20210303191205.1656980-8-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=bin.meng@windriver.com \
--cc=bmeng.cn@gmail.com \
--cc=dmitry.fleytman@gmail.com \
--cc=jasowang@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).