From nobody Mon Feb 9 01:51:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1580290611262928.3610672248725; Wed, 29 Jan 2020 01:36:51 -0800 (PST) Received: from localhost ([::1]:43246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwjmE-0005No-1p for importer@patchew.org; Wed, 29 Jan 2020 04:36:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51410) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwjl3-0003bV-TS for qemu-devel@nongnu.org; Wed, 29 Jan 2020 04:35:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwjl1-0000k9-RS for qemu-devel@nongnu.org; Wed, 29 Jan 2020 04:35:37 -0500 Received: from kvm5.telegraphics.com.au ([98.124.60.144]:50046) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iwjl1-0000jY-N6; Wed, 29 Jan 2020 04:35:35 -0500 Received: by kvm5.telegraphics.com.au (Postfix, from userid 502) id 57278299BE; Wed, 29 Jan 2020 04:35:35 -0500 (EST) To: Jason Wang , qemu-devel@nongnu.org Message-Id: <1753b927c867d25e87da8d5d20fa0b9d60f938cb.1580290069.git.fthain@telegraphics.com.au> In-Reply-To: References: From: Finn Thain Subject: [PATCH v4 04/14] dp8393x: Have dp8393x_receive() return the packet size MIME-Version: 1.0 Date: Wed, 29 Jan 2020 20:27:49 +1100 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 98.124.60.144 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Rikalo , =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= , Laurent Vivier , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Laurent Vivier --- 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 2d2ace2549..ece72cbf42 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -757,20 +757,21 @@ static int dp8393x_receive_filter(dp8393xState *s, co= nst uint8_t * buf, } =20 static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf, - size_t size) + size_t pkt_size) { dp8393xState *s =3D qemu_get_nic_opaque(nc); int packet_type; uint32_t available, address; - int width, rx_len =3D size; + int width, rx_len =3D pkt_size; uint32_t checksum; + int size; =20 width =3D (s->regs[SONIC_DCR] & SONIC_DCR_DW) ? 2 : 1; =20 s->regs[SONIC_RCR] &=3D ~(SONIC_RCR_PRX | SONIC_RCR_LBK | SONIC_RCR_FA= ER | SONIC_RCR_CRCR | SONIC_RCR_LPKT | SONIC_RCR_BC | SONIC_RCR_MC); =20 - packet_type =3D dp8393x_receive_filter(s, buf, size); + packet_type =3D dp8393x_receive_filter(s, buf, pkt_size); if (packet_type < 0) { DPRINTF("packet not for netcard\n"); return -1; @@ -864,7 +865,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, cons= t uint8_t * buf, /* Done */ dp8393x_update_irq(s); =20 - return size; + return pkt_size; } =20 static void dp8393x_reset(DeviceState *dev) --=20 2.24.1