diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2025-07-14 17:55:21 +0100 |
|---|---|---|
| committer | Jason Wang <jasowang@redhat.com> | 2025-07-21 10:21:42 +0800 |
| commit | 01b327c9a609cb613da1e04c5af5f4fcc7d9c0a3 (patch) | |
| tree | 98849323192ec70cc260d656a51f2f094b31dbef | |
| parent | 871a6e5b339f0b5e71925ec7d3f452944a1c82d3 (diff) | |
| download | qemu-01b327c9a609cb613da1e04c5af5f4fcc7d9c0a3.zip qemu-01b327c9a609cb613da1e04c5af5f4fcc7d9c0a3.tar.gz qemu-01b327c9a609cb613da1e04c5af5f4fcc7d9c0a3.tar.bz2 | |
hw/net/npcm_gmac.c: Unify length and prev_buf_size variables
After the bug fix in the previous commit, the length and prev_buf_size
variables are identical, except that prev_buf_size is uint32_t and
length is uint16_t. We can therefore unify them. The only place where
the type makes a difference is that we will truncate the packet
at 64K when sending it; this commit preserves that behaviour
by using a local variable when doing the packet send.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
| -rw-r--r-- | hw/net/npcm_gmac.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/hw/net/npcm_gmac.c b/hw/net/npcm_gmac.c index 921327d..a0050a7 100644 --- a/hw/net/npcm_gmac.c +++ b/hw/net/npcm_gmac.c @@ -516,7 +516,6 @@ static void gmac_try_send_next_packet(NPCMGMACState *gmac) uint32_t desc_addr; struct NPCMGMACTxDesc tx_desc; uint32_t tx_buf_addr, tx_buf_len; - uint16_t length = 0; uint8_t *buf = tx_send_buffer; uint32_t prev_buf_size = 0; int csum = 0; @@ -583,7 +582,6 @@ static void gmac_try_send_next_packet(NPCMGMACState *gmac) __func__, tx_buf_addr); return; } - length += tx_buf_len; prev_buf_size += tx_buf_len; /* If not chained we'll have a second buffer. */ @@ -606,15 +604,18 @@ static void gmac_try_send_next_packet(NPCMGMACState *gmac) __func__, tx_buf_addr); return; } - length += tx_buf_len; prev_buf_size += tx_buf_len; } if (tx_desc.tdes1 & TX_DESC_TDES1_LAST_SEG_MASK) { + /* + * This will truncate the packet at 64K. + * TODO: find out if this is the correct behaviour. + */ + uint16_t length = prev_buf_size; net_checksum_calculate(tx_send_buffer, length, csum); qemu_send_packet(qemu_get_queue(gmac->nic), tx_send_buffer, length); trace_npcm_gmac_packet_sent(DEVICE(gmac)->canonical_path, length); buf = tx_send_buffer; - length = 0; prev_buf_size = 0; } |