Commit 1865e288 authored by Mike Nawrocki's avatar Mike Nawrocki Committed by Jason Wang
Browse files

Fix eepro100 simple transmission mode 



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: default avatarMike Nawrocki <michael.nawrocki@gtri.gatech.edu>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent 8fa5ad6d

hw/net/eepro100.c

+3 −15
Original line number Diff line number Diff line
@@ -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. */