diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2025-07-14 17:55:22 +0100 |
|---|---|---|
| committer | Jason Wang <jasowang@redhat.com> | 2025-07-21 10:21:44 +0800 |
| commit | e96a1aa6766f1b188dada3ad8d172c0fbe2f3a5f (patch) | |
| tree | 07aed85d624c55ed651e73846f1df8e520b16f51 | |
| parent | 01b327c9a609cb613da1e04c5af5f4fcc7d9c0a3 (diff) | |
| download | qemu-e96a1aa6766f1b188dada3ad8d172c0fbe2f3a5f.zip qemu-e96a1aa6766f1b188dada3ad8d172c0fbe2f3a5f.tar.gz qemu-e96a1aa6766f1b188dada3ad8d172c0fbe2f3a5f.tar.bz2 | |
hw/net/npcm_gmac.c: Correct test for when to reallocate packet buffer
In gmac_try_send_next_packet() we have code that does "if this block
of data won't fit in the buffer, reallocate it". However, the
condition it uses is
if ((prev_buf_size + tx_buf_len) > sizeof(buf))
where buf is a uint8_t *.
This means that sizeof(buf) is always 8 bytes, and the condition will
almost always be true, so we will reallocate the buffer more often
than we need to.
Correct the condition to test against tx_buffer_size, which is
where we track how big the allocated buffer is.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/net/npcm_gmac.c b/hw/net/npcm_gmac.c index a0050a7..0c17ae9 100644 --- a/hw/net/npcm_gmac.c +++ b/hw/net/npcm_gmac.c @@ -569,7 +569,7 @@ static void gmac_try_send_next_packet(NPCMGMACState *gmac) tx_buf_len = TX_DESC_TDES1_BFFR1_SZ_MASK(tx_desc.tdes1); buf = &tx_send_buffer[prev_buf_size]; - if ((prev_buf_size + tx_buf_len) > sizeof(buf)) { + if ((prev_buf_size + tx_buf_len) > tx_buffer_size) { tx_buffer_size = prev_buf_size + tx_buf_len; tx_send_buffer = g_realloc(tx_send_buffer, tx_buffer_size); buf = &tx_send_buffer[prev_buf_size]; @@ -591,7 +591,7 @@ static void gmac_try_send_next_packet(NPCMGMACState *gmac) tx_buf_len = TX_DESC_TDES1_BFFR2_SZ_MASK(tx_desc.tdes1); buf = &tx_send_buffer[prev_buf_size]; - if ((prev_buf_size + tx_buf_len) > sizeof(buf)) { + if ((prev_buf_size + tx_buf_len) > tx_buffer_size) { tx_buffer_size = prev_buf_size + tx_buf_len; tx_send_buffer = g_realloc(tx_send_buffer, tx_buffer_size); buf = &tx_send_buffer[prev_buf_size]; |