[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 07/13] hw/net: vmxnet3: Remove the logic of padding short fram
From: |
Bin Meng |
Subject: |
[PATCH v3 07/13] hw/net: vmxnet3: Remove the logic of padding short frames in the receive path |
Date: |
Tue, 16 Mar 2021 16:12:48 +0800 |
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 40a87c6c9b11ef9c14e0301f76abf0eb2582f08e.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---
(no changes since v1)
hw/net/vmxnet3.c | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index eff299f629..d993cce097 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -39,7 +39,6 @@
#define PCI_DEVICE_ID_VMWARE_VMXNET3_REVISION 0x1
#define VMXNET3_MSIX_BAR_SIZE 0x2000
-#define MIN_BUF_SIZE 60
/* Compatibility flags for migration */
#define VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS_BIT 0
@@ -1951,7 +1950,6 @@ vmxnet3_receive(NetClientState *nc, const uint8_t *buf,
size_t size)
{
VMXNET3State *s = qemu_get_nic_opaque(nc);
size_t bytes_indicated;
- uint8_t min_buf[MIN_BUF_SIZE];
if (!vmxnet3_can_receive(nc)) {
VMW_PKPRN("Cannot receive now");
@@ -1964,14 +1962,6 @@ vmxnet3_receive(NetClientState *nc, const uint8_t *buf,
size_t size)
size -= sizeof(struct virtio_net_hdr);
}
- /* Pad to minimum Ethernet frame length */
- if (size < sizeof(min_buf)) {
- memcpy(min_buf, buf, size);
- memset(&min_buf[size], 0, sizeof(min_buf) - size);
- buf = min_buf;
- size = sizeof(min_buf);
- }
-
net_rx_pkt_set_packet_type(s->rx_pkt,
get_eth_packet_type(PKT_GET_ETH_HDR(buf)));
--
2.17.1
- [PATCH v3 00/13] net: Pad short frames for network backends, Bin Meng, 2021/03/16
- [PATCH v3 01/13] net: eth: Add a helper to pad a short ethernet frame, Bin Meng, 2021/03/16
- [PATCH v3 03/13] net: slirp: Pad short frames to minimum size before send, Bin Meng, 2021/03/16
- [PATCH v3 02/13] net: Add a 'do_not_pad" to NetClientState, Bin Meng, 2021/03/16
- [PATCH v3 04/13] net: tap: Pad short frames to minimum size before send, Bin Meng, 2021/03/16
- [PATCH v3 05/13] hw/net: virtio-net: Initialize nc->do_not_pad to true, Bin Meng, 2021/03/16
- [PATCH v3 06/13] hw/net: e1000: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/16
- [PATCH v3 07/13] hw/net: vmxnet3: Remove the logic of padding short frames in the receive path,
Bin Meng <=
- [PATCH v3 08/13] hw/net: i82596: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/16
- [PATCH v3 09/13] hw/net: ne2000: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/16
- [PATCH v3 10/13] hw/net: pcnet: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/16
- [PATCH v3 11/13] hw/net: rtl8139: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/16
- [PATCH v3 12/13] hw/net: sungem: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/16
- [PATCH v3 13/13] hw/net: sunhme: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/16