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 07/12] hw/net: i82596: Remove the logic of padding short frames in the receive path
Date: Wed, 17 Mar 2021 14:26:33 +0800 [thread overview]
Message-ID: <20210317062638.72626-8-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.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---
(no changes since v1)
hw/net/i82596.c | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/hw/net/i82596.c b/hw/net/i82596.c
index 055c3a1470..1eca2e2d81 100644
--- a/hw/net/i82596.c
+++ b/hw/net/i82596.c
@@ -73,10 +73,6 @@ enum commands {
#define I596_EOF 0x8000
#define SIZE_MASK 0x3fff
-#define ETHER_TYPE_LEN 2
-#define VLAN_TCI_LEN 2
-#define VLAN_HLEN (ETHER_TYPE_LEN + VLAN_TCI_LEN)
-
/* various flags in the chip config registers */
#define I596_PREFETCH (s->config[0] & 0x80)
#define I596_PROMISC (s->config[8] & 0x01)
@@ -489,8 +485,6 @@ bool i82596_can_receive(NetClientState *nc)
return true;
}
-#define MIN_BUF_SIZE 60
-
ssize_t i82596_receive(NetClientState *nc, const uint8_t *buf, size_t sz)
{
I82596State *s = qemu_get_nic_opaque(nc);
@@ -501,7 +495,6 @@ ssize_t i82596_receive(NetClientState *nc, const uint8_t *buf, size_t sz)
size_t bufsz = sz; /* length of data in buf */
uint32_t crc;
uint8_t *crc_ptr;
- uint8_t buf1[MIN_BUF_SIZE + VLAN_HLEN];
static const uint8_t broadcast_macaddr[6] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
@@ -584,17 +577,6 @@ ssize_t i82596_receive(NetClientState *nc, const uint8_t *buf, size_t sz)
}
}
- /* if too small buffer, then expand it */
- if (len < MIN_BUF_SIZE + VLAN_HLEN) {
- memcpy(buf1, buf, len);
- memset(buf1 + len, 0, MIN_BUF_SIZE + VLAN_HLEN - len);
- buf = buf1;
- if (len < MIN_BUF_SIZE) {
- len = MIN_BUF_SIZE;
- }
- bufsz = len;
- }
-
/* Calculate the ethernet checksum (4 bytes) */
len += 4;
crc = cpu_to_be32(crc32(~0, buf, sz));
--
2.17.1
next prev parent reply other threads:[~2021-03-17 7:14 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 ` [PATCH v5 05/12] hw/net: e1000: Remove the logic of padding short frames in the receive path Bin Meng
2021-03-17 6:26 ` [PATCH v5 06/12] hw/net: vmxnet3: " Bin Meng
2021-03-17 6:26 ` Bin Meng [this message]
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-8-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).