From nobody Sun Feb 8 15:01:32 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 ARC-Seal: i=1; a=rsa-sha256; t=1576815821; cv=none; d=zohomail.com; s=zohoarc; b=bF/S+3QgPxe/7rMKhh0k1iqgtl8OuHVFBm8fekd1XWgbnAxHrYCq9+T/Xw/5e6CWQATjNEsxz7TxE2J0JsVvhmSbixveyIPBHKyMobe+D8xRrDsWj0aTqNdaM7EMnqioqvq9S+Ouf1sRwpJ/CB2S28MUifIC0WLPeVTD0wWOq80= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576815821; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=djimg/slKGFsJgOYTm0h2GvK0GuIFU4M9Yz/xhUxJWg=; b=P5CJn7/JuWvq1Jw+h3RfRVUiXsaPdvxr7H4a0rwME+5C5KzTXOWCOvwlIbSox/D9EJHV6wnzcJoHTgTTkVd9s8ITXT+YZv7fsMJMVgolbmO/gCZaVz+9Hlkvwb9Vh3jScNt477p3fMPrRl4bZCmFQ3hpDfMefx+k6Q3FAt1NLAY= ARC-Authentication-Results: i=1; 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 1576815821764826.9874389894364; Thu, 19 Dec 2019 20:23:41 -0800 (PST) Received: from localhost ([::1]:50508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ii9pD-00023c-Tw for importer@patchew.org; Thu, 19 Dec 2019 23:23:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55685) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ii9nf-0008T9-WB for qemu-devel@nongnu.org; Thu, 19 Dec 2019 23:22:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ii9ne-0001z6-HI for qemu-devel@nongnu.org; Thu, 19 Dec 2019 23:22:03 -0500 Received: from kvm5.telegraphics.com.au ([98.124.60.144]:34426) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ii9ne-0001xo-9T; Thu, 19 Dec 2019 23:22:02 -0500 Received: by kvm5.telegraphics.com.au (Postfix, from userid 502) id 1041628CC5; Thu, 19 Dec 2019 23:22:02 -0500 (EST) To: Jason Wang , qemu-devel@nongnu.org Message-Id: <73bc39e93a9480aa5ed3ef2f85447c2504e4d8c8.1576815466.git.fthain@telegraphics.com.au> In-Reply-To: References: From: Finn Thain Subject: [PATCH v2 03/13] dp8393x: Have dp8393x_receive() return the packet size MIME-Version: 1.0 Date: Fri, 20 Dec 2019 15:17:46 +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: Aleksandar Rikalo , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , 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 --- 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, 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; @@ -853,7 +854,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.23.0