[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 3/9] hw/net: i82596: Remove the logic of padding short frames
From: |
Bin Meng |
Subject: |
[PATCH v7 3/9] hw/net: i82596: Remove the logic of padding short frames in the receive path |
Date: |
Sun, 25 Jun 2023 09:53:15 +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@tinylab.org>
---
(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 ec21e2699a..ab26f8bea1 100644
--- a/hw/net/i82596.c
+++ b/hw/net/i82596.c
@@ -72,10 +72,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)
@@ -488,8 +484,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);
@@ -500,7 +494,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 };
@@ -583,17 +576,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.34.1
- [PATCH v7 0/9] net: Pad short frames for network backends, Bin Meng, 2023/06/24
- [PATCH v7 8/9] hw/net: sunhme: Remove the logic of padding short frames in the receive path, Bin Meng, 2023/06/24
- [PATCH v7 5/9] hw/net: pcnet: Remove the logic of padding short frames in the receive path, Bin Meng, 2023/06/24
- [PATCH v7 1/9] hw/net: e1000: Remove the logic of padding short frames in the receive path, Bin Meng, 2023/06/24
- [PATCH v7 6/9] hw/net: rtl8139: Remove the logic of padding short frames in the receive path, Bin Meng, 2023/06/24
- [PATCH v7 4/9] hw/net: ne2000: Remove the logic of padding short frames in the receive path, Bin Meng, 2023/06/24
- [PATCH v7 7/9] hw/net: sungem: Remove the logic of padding short frames in the receive path, Bin Meng, 2023/06/24
- [PATCH v7 2/9] hw/net: vmxnet3: Remove the logic of padding short frames in the receive path, Bin Meng, 2023/06/24
- [PATCH v7 3/9] hw/net: i82596: Remove the logic of padding short frames in the receive path,
Bin Meng <=
- [PATCH v7 9/9] hw/net: ftgmac100: Drop the small packet check in the receive path, Bin Meng, 2023/06/24