[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 10/12] hw/net: rtl8139: Remove the logic of padding short fram
From: |
Bin Meng |
Subject: |
[PATCH v4 10/12] hw/net: rtl8139: Remove the logic of padding short frames in the receive path |
Date: |
Tue, 16 Mar 2021 20:04:18 +0800 |
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/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
- Re: [PATCH v4 01/12] net: eth: Add a helper to pad a short Ethernet frame, (continued)
- [PATCH v4 02/12] net: Add a 'do_not_pad" to NetClientState, Bin Meng, 2021/03/16
- [PATCH v4 03/12] net: Pad short frames to minimum size before sending from SLiRP/TAP, Bin Meng, 2021/03/16
- [PATCH v4 04/12] hw/net: virtio-net: Initialize nc->do_not_pad to true, Bin Meng, 2021/03/16
- [PATCH v4 05/12] hw/net: e1000: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/16
- [PATCH v4 06/12] hw/net: vmxnet3: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/16
- [PATCH v4 07/12] hw/net: i82596: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/16
- [PATCH v4 08/12] hw/net: ne2000: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/16
- [PATCH v4 09/12] hw/net: pcnet: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/16
- [PATCH v4 10/12] hw/net: rtl8139: Remove the logic of padding short frames in the receive path,
Bin Meng <=
- [PATCH v4 11/12] hw/net: sungem: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/16
- [PATCH v4 12/12] hw/net: sunhme: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/16