[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/8] Fix eepro100 simple transmission mode
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 6/8] Fix eepro100 simple transmission mode |
Date: |
Tue, 14 Nov 2017 10:11:36 +0800 |
From: Mike Nawrocki <address@hidden>
The simple transmission mode was treating the area immediately after the
transmit command block (TCB) as if it were a transmit buffer descriptor,
when in reality it is simply the packet data. This change simply copies
the data following the TCB into the packet buffer.
Signed-off-by: Mike Nawrocki <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/net/eepro100.c | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
index 80b8f47..91dd058 100644
--- a/hw/net/eepro100.c
+++ b/hw/net/eepro100.c
@@ -774,23 +774,11 @@ static void tx_command(EEPRO100State *s)
}
assert(tcb_bytes <= sizeof(buf));
while (size < tcb_bytes) {
- uint32_t tx_buffer_address = ldl_le_pci_dma(&s->dev, tbd_address);
- uint16_t tx_buffer_size = lduw_le_pci_dma(&s->dev, tbd_address + 4);
-#if 0
- uint16_t tx_buffer_el = lduw_le_pci_dma(&s->dev, tbd_address + 6);
-#endif
- if (tx_buffer_size == 0) {
- /* Prevent an endless loop. */
- logout("loop in %s:%u\n", __FILE__, __LINE__);
- break;
- }
- tbd_address += 8;
TRACE(RXTX, logout
("TBD (simplified mode): buffer address 0x%08x, size 0x%04x\n",
- tx_buffer_address, tx_buffer_size));
- tx_buffer_size = MIN(tx_buffer_size, sizeof(buf) - size);
- pci_dma_read(&s->dev, tx_buffer_address, &buf[size], tx_buffer_size);
- size += tx_buffer_size;
+ tbd_address, tcb_bytes));
+ pci_dma_read(&s->dev, tbd_address, &buf[size], tcb_bytes);
+ size += tcb_bytes;
}
if (tbd_array == 0xffffffff) {
/* Simplified mode. Was already handled by code above. */
--
2.7.4
- [Qemu-devel] [PULL 0/8] Net patches, Jason Wang, 2017/11/13
- [Qemu-devel] [PULL 1/8] net: fix check for number of parameters to -netdev socket, Jason Wang, 2017/11/13
- [Qemu-devel] [PULL 2/8] colo-compare: Insert packet into the suitable position of packet queue directly, Jason Wang, 2017/11/13
- [Qemu-devel] [PULL 3/8] colo-compare: compare the packet in a specified Connection, Jason Wang, 2017/11/13
- [Qemu-devel] [PULL 4/8] colo-compare: Fix comments, Jason Wang, 2017/11/13
- [Qemu-devel] [PULL 6/8] Fix eepro100 simple transmission mode,
Jason Wang <=
- [Qemu-devel] [PULL 5/8] colo: Consolidate the duplicate code chunk into a routine, Jason Wang, 2017/11/13
- [Qemu-devel] [PULL 7/8] Add new PCI ID for i82559a, Jason Wang, 2017/11/13
- [Qemu-devel] [PULL 8/8] net/socket: fix coverity issue, Jason Wang, 2017/11/13
- Re: [Qemu-devel] [PULL 0/8] Net patches, Peter Maydell, 2017/11/14