[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 08/13] hw/net: i82596: Remove the logic of padding short frame
From: |
Bin Meng |
Subject: |
[PATCH v3 08/13] hw/net: i82596: Remove the logic of padding short frames in the receive path |
Date: |
Tue, 16 Mar 2021 16:12:49 +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/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
- [PATCH v3 01/13] net: eth: Add a helper to pad a short ethernet frame, (continued)
- [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, 2021/03/16
- [PATCH v3 08/13] hw/net: i82596: Remove the logic of padding short frames in the receive path,
Bin Meng <=
- [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