From nobody Thu Dec 18 17:54:26 2025 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; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1583135131; cv=none; d=zohomail.com; s=zohoarc; b=D+FZ0kK9UdYR1bTYY9zUKCgh3EXv/hfMIvjt9gzkLx+2iFIBQkVl/+qWTNdSe8BKvD51D0ypCL91QpUPyCSPGj3RtPrULCtnjyOYk7+Ox0UVGn3aVP6KRH0ULcqASCV1LeCWdHJwyLiyJNfLGF+Tfg8cRjg8yhEp6dmSTrecibE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583135131; 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=JH+RB81HXiuvd/zhpDJS7O/7Rt1VoS75u8d6tZLzezA=; b=e4QvRqlqCmaCaZqOn7lKg16cNw43RMjd/65ta+lYAxDAQRl1tDTyUxt6wVVO4PdByj0jZvjeHWHUdBCwIJQOSk/iE0c7+W4aZKyZiqF/6a2FMiWX2Ye835c/lYmH8Ao98+4pVKmcqU1JxD5J4eEjI3L20mid5t74FTaNubVZIaE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583135131585700.377310953469; Sun, 1 Mar 2020 23:45:31 -0800 (PST) Received: from localhost ([::1]:56034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8fla-0004gf-Dj for importer@patchew.org; Mon, 02 Mar 2020 02:45:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60039) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8fh9-0003c4-Gy for qemu-devel@nongnu.org; Mon, 02 Mar 2020 02:40:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8fh8-0003P3-G5 for qemu-devel@nongnu.org; Mon, 02 Mar 2020 02:40:55 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:53063 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j8fh8-0003OP-CM for qemu-devel@nongnu.org; Mon, 02 Mar 2020 02:40:54 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-141-DQoa_lk_NeKdqnNzs7iQYg-1; Mon, 02 Mar 2020 02:40:50 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0C7EE107ACC4; Mon, 2 Mar 2020 07:40:49 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (ovpn-12-58.pek2.redhat.com [10.72.12.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id 614F060BF3; Mon, 2 Mar 2020 07:40:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583134854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JH+RB81HXiuvd/zhpDJS7O/7Rt1VoS75u8d6tZLzezA=; b=RQHwyG+nR88rEjCwOFG9V9qJXS4pl6WdY1FPMf8gKMYvBxiufB6whG8/42EQLuNYZpTA1M y/aPdChV3HjIt4OcFIeIM26vlybXcNdDkCTuSrRwDcVbAmPx3w87whQQusdSKxZiNj6Obr NGOxQ+pEeqIGkV0WGwOiOuvwB3pwp5k= X-MC-Unique: DQoa_lk_NeKdqnNzs7iQYg-1 From: Jason Wang To: peter.maydell@linaro.org Subject: [PULL 04/23] dp8393x: Have dp8393x_receive() return the packet size Date: Mon, 2 Mar 2020 15:40:17 +0800 Message-Id: <1583134836-23991-5-git-send-email-jasowang@redhat.com> In-Reply-To: <1583134836-23991-1-git-send-email-jasowang@redhat.com> References: <1583134836-23991-1-git-send-email-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Jason Wang , qemu-devel@nongnu.org, Finn Thain Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Finn Thain 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 Signed-off-by: Jason Wang --- 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 1844482..ed57f5f 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -759,20 +759,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; @@ -868,7 +869,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.5.0