[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 03/13] dp8393x: Have dp8393x_receive() return the packet size
From: |
Finn Thain |
Subject: |
[PATCH v2 03/13] dp8393x: Have dp8393x_receive() return the packet size |
Date: |
Fri, 20 Dec 2019 15:17:46 +1100 |
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/net/dp8393x.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index b2cc768d9b..a3e3a82ff4 100644
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -746,20 +746,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;
@@ -853,7 +854,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)
--
2.23.0
- [PATCH v2 00/13] Fixes for DP8393X SONIC device emulation, Finn Thain, 2019/12/19
- [PATCH v2 03/13] dp8393x: Have dp8393x_receive() return the packet size,
Finn Thain <=
- [PATCH v2 05/13] dp8393x: Clear RRRA command register bit only when appropriate, Finn Thain, 2019/12/19
- [PATCH v2 04/13] dp8393x: Update LLFA and CRDA registers from rx descriptor, Finn Thain, 2019/12/19
- [PATCH v2 09/13] dp8393x: Use long-word-aligned RRA pointers in 32-bit mode, Finn Thain, 2019/12/19
- [PATCH v2 10/13] dp8393x: Pad frames to word or long word boundary, Finn Thain, 2019/12/19
- [PATCH v2 02/13] dp8393x: Clean up endianness hacks, Finn Thain, 2019/12/19
- [PATCH v2 08/13] dp8393x: Don't clobber packet checksum, Finn Thain, 2019/12/19
- [PATCH v2 06/13] dp8393x: Implement packet size limit and RBAE interrupt, Finn Thain, 2019/12/19
- [PATCH v2 07/13] dp8393x: Don't stop reception upon RBE interrupt assertion, Finn Thain, 2019/12/19
- [PATCH v2 12/13] dp8393x: Always update RRA pointers and sequence numbers, Finn Thain, 2019/12/19
- [PATCH v2 11/13] dp8393x: Clear descriptor in_use field when necessary, Finn Thain, 2019/12/19