[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/17] hw/net/stellaris_enet: Correct handling of pac
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 04/17] hw/net/stellaris_enet: Correct handling of packet padding |
Date: |
Tue, 13 May 2014 16:31:26 +0100 |
The PADEN bit in the transmit control register enables padding of short
data packets out to the required minimum length. However a typo here
meant we were adjusting tx_fifo_len rather than tx_frame_len, so the
padding didn't actually happen. Fix this bug.
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Cc: address@hidden
---
hw/net/stellaris_enet.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c
index bd844cd..d0da819 100644
--- a/hw/net/stellaris_enet.c
+++ b/hw/net/stellaris_enet.c
@@ -265,7 +265,7 @@ static void stellaris_enet_write(void *opaque, hwaddr
offset,
s->tx_frame_len -= 4;
if ((s->tctl & SE_TCTL_PADEN) && s->tx_frame_len < 60) {
memset(&s->tx_fifo[s->tx_frame_len], 0, 60 -
s->tx_frame_len);
- s->tx_fifo_len = 60;
+ s->tx_frame_len = 60;
}
qemu_send_packet(qemu_get_queue(s->nic), s->tx_fifo,
s->tx_frame_len);
--
1.9.2
- [Qemu-devel] [PULL 15/17] hw/timer/exynos4210_mct: Avoid overflow in exynos4210_ltick_recalc_count, (continued)
- [Qemu-devel] [PULL 15/17] hw/timer/exynos4210_mct: Avoid overflow in exynos4210_ltick_recalc_count, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 03/17] hw/net/stellaris_enet: Restructure tx_fifo code to avoid buffer overrun, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 14/17] hw/dma/omap_dma: Add (uint32_t) casts when shifting uint16_t by 16, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 16/17] hw/arm/stellaris: Correct handling of GPTM TAR register, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 10/17] target-arm/helper.c: Don't flush the TLB if SCTLR is rewritten unchanged, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 13/17] hw/arm/omap1: Avoid unintended sign extension writing omap_rtc YEARS_REG, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 11/17] hw/intc/allwinner-a10-pic: Add missing 'break', Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 06/17] hw/net/stellaris_enet: Correctly implement the TR and THR registers, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 05/17] hw/net/stellaris_enet: Rewrite tx fifo handling code, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 08/17] hw/net/stellaris_enet: Get rid of rx_fifo pointer, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 04/17] hw/net/stellaris_enet: Correct handling of packet padding,
Peter Maydell <=
- [Qemu-devel] [PULL 07/17] hw/net/stellaris_enet: Fix debug format strings, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 01/17] disas/libvixl: Update to libvixl 1.4, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 02/17] savevm: Remove all the unneeded version_minimum_id_old (arm), Peter Maydell, 2014/05/13
- Re: [Qemu-devel] [PULL 00/17] target-arm queue, Peter Maydell, 2014/05/15