From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org, richard.henderson@linaro.org,
peter.maydell@linaro.org
Cc: Bin Meng <bmeng@tinylab.org>, Jason Wang <jasowang@redhat.com>
Subject: [PULL 08/15] hw/net: sungem: Remove the logic of padding short frames in the receive path
Date: Fri, 7 Jul 2023 05:06:21 -0400 [thread overview]
Message-ID: <20230707090628.2210346-9-jasowang@redhat.com> (raw)
In-Reply-To: <20230707090628.2210346-1-jasowang@redhat.com>
From: Bin Meng <bmeng@tinylab.org>
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@tinylab.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
hw/net/sungem.c | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/hw/net/sungem.c b/hw/net/sungem.c
index eb01520..103376c 100644
--- a/hw/net/sungem.c
+++ b/hw/net/sungem.c
@@ -550,7 +550,6 @@ static ssize_t sungem_receive(NetClientState *nc, const uint8_t *buf,
PCIDevice *d = PCI_DEVICE(s);
uint32_t mac_crc, done, kick, max_fsize;
uint32_t fcs_size, ints, rxdma_cfg, rxmac_cfg, csum, coff;
- uint8_t smallbuf[60];
struct gem_rxd desc;
uint64_t dbase, baddr;
unsigned int rx_cond;
@@ -584,19 +583,6 @@ static ssize_t sungem_receive(NetClientState *nc, const uint8_t *buf,
return size;
}
- /* We don't drop too small frames since we get them in qemu, we pad
- * them instead. We should probably use the min frame size register
- * but I don't want to use a variable size staging buffer and I
- * know both MacOS and Linux use the default 64 anyway. We use 60
- * here to account for the non-existent FCS.
- */
- if (size < 60) {
- memcpy(smallbuf, buf, size);
- memset(&smallbuf[size], 0, 60 - size);
- buf = smallbuf;
- size = 60;
- }
-
/* Get MAC crc */
mac_crc = net_crc32_le(buf, ETH_ALEN);
--
2.7.4
next prev parent reply other threads:[~2023-07-07 9:08 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-07 9:06 [PULL 00/15] Net patches Jason Wang
2023-07-07 9:06 ` [PULL 01/15] virtio-net: correctly report maximum tx_queue_size value Jason Wang
2023-07-07 9:06 ` [PULL 02/15] hw/net: e1000: Remove the logic of padding short frames in the receive path Jason Wang
2023-07-07 9:06 ` [PULL 03/15] hw/net: vmxnet3: " Jason Wang
2023-07-07 9:06 ` [PULL 04/15] hw/net: i82596: " Jason Wang
2023-07-07 9:06 ` [PULL 05/15] hw/net: ne2000: " Jason Wang
2023-07-07 9:06 ` [PULL 06/15] hw/net: pcnet: " Jason Wang
2023-07-07 9:06 ` [PULL 07/15] hw/net: rtl8139: " Jason Wang
2023-07-07 9:06 ` Jason Wang [this message]
2023-07-07 9:06 ` [PULL 09/15] hw/net: sunhme: " Jason Wang
2023-07-07 9:06 ` [PULL 10/15] hw/net: ftgmac100: Drop the small packet check " Jason Wang
2023-07-07 9:06 ` [PULL 11/15] net: socket: prepare to cleanup net_init_socket() Jason Wang
2023-07-07 9:06 ` [PULL 12/15] net: socket: move fd type checking to its own function Jason Wang
2023-07-07 9:06 ` [PULL 13/15] net: socket: remove net_init_socket() Jason Wang
2023-07-07 9:06 ` [PULL 14/15] e1000e: Add ICR clearing by corresponding IMS bit Jason Wang
2023-07-07 9:06 ` [PULL 15/15] igb: Remove obsolete workaround for Windows Jason Wang
2023-07-07 19:20 ` [PULL 00/15] Net patches Richard Henderson
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=20230707090628.2210346-9-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=bmeng@tinylab.org \
--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).