diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2020-01-29 20:27:49 +1100 |
|---|---|---|
| committer | Jason Wang <jasowang@redhat.com> | 2020-03-03 18:04:47 +0800 |
| commit | 9e3cd456d85ad45e72bdba99203302342ce29b3b (patch) | |
| tree | bb1bbfa2a7ca552f8387057f17a203bce68600c2 /hw/net | |
| parent | 46ffee9ad43185cbee4182c208bbd534814086ca (diff) | |
| download | qemu-9e3cd456d85ad45e72bdba99203302342ce29b3b.zip qemu-9e3cd456d85ad45e72bdba99203302342ce29b3b.tar.gz qemu-9e3cd456d85ad45e72bdba99203302342ce29b3b.tar.bz2 | |
dp8393x: Have dp8393x_receive() return the packet size
This function re-uses its 'size' argument as a scratch variable.
Instead, declare a local 'size' variable for that purpose so that the
function result doesn't get messed up.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'hw/net')
| -rw-r--r-- | hw/net/dp8393x.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 1844482..ed57f5f 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -759,20 +759,21 @@ static int dp8393x_receive_filter(dp8393xState *s, const uint8_t * buf, } static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf, - size_t size) + size_t pkt_size) { dp8393xState *s = qemu_get_nic_opaque(nc); int packet_type; uint32_t available, address; - int width, rx_len = size; + int width, rx_len = pkt_size; uint32_t checksum; + int size; width = (s->regs[SONIC_DCR] & SONIC_DCR_DW) ? 2 : 1; s->regs[SONIC_RCR] &= ~(SONIC_RCR_PRX | SONIC_RCR_LBK | SONIC_RCR_FAER | SONIC_RCR_CRCR | SONIC_RCR_LPKT | SONIC_RCR_BC | SONIC_RCR_MC); - packet_type = dp8393x_receive_filter(s, buf, size); + packet_type = dp8393x_receive_filter(s, buf, pkt_size); if (packet_type < 0) { DPRINTF("packet not for netcard\n"); return -1; @@ -868,7 +869,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf, /* Done */ dp8393x_update_irq(s); - return size; + return pkt_size; } static void dp8393x_reset(DeviceState *dev) |