From nobody Mon Feb 9 13:38:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615896944; cv=none; d=zohomail.com; s=zohoarc; b=bNk9OPrnlKsRtDjsyQDyuUbAPRPFUEyy3BRbWrUgErG5VlMet59vx540tl02NiuI7itHu95fsR/STqrXMVp1qi6AkC87JcqlXwjUdszeHP5b9ZvHvHXzYpmfQBJSGt95TT4COb0cvilRQceIZtwr54OstN7zdC2WH/nHhCe4/wc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615896944; h=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=m4a685HUG50oDycdiMz8MX8zwTLJNRbcKkuniaQymBg=; b=ZWp5co3fXw1tsSSaGGVAovbcZpCS10uIN2fwGxdDq8IrhSFkZZ/B4odLBQIQAfA1sUrccnTF7dhSCM/cC3leiibM+6BIFfivkfkaYbqyVMnRmmI72FkuL+vZ1GhOREoNA0g5+A/t9xdXFC45mHnRyOlLYKOpN2iBf6tT/tgsw+w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1615896944708703.0234678944537; Tue, 16 Mar 2021 05:15:44 -0700 (PDT) Received: from localhost ([::1]:33242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM8bv-0003dU-JM for importer@patchew.org; Tue, 16 Mar 2021 08:15:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36936) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM8RZ-00038a-5i for qemu-devel@nongnu.org; Tue, 16 Mar 2021 08:05:02 -0400 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]:33013) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM8RX-0003xo-3L for qemu-devel@nongnu.org; Tue, 16 Mar 2021 08:05:00 -0400 Received: by mail-pg1-x52c.google.com with SMTP id g4so22466011pgj.0 for ; Tue, 16 Mar 2021 05:04:58 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id d5sm2722166pjo.12.2021.03.16.05.04.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Mar 2021 05:04:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m4a685HUG50oDycdiMz8MX8zwTLJNRbcKkuniaQymBg=; b=M26o6+/gIoVWq1yhrwPviF3LbgG2XPyKRaYJDYEGXBPfKWm4kqGh+b2ucaZGDQA8Q3 zSOBSRdV9KpRsT+lyfUT6rTfEq14e3ln5YrnZ/B09e438sKaoeW5LAKeNu5TRc0SGfMb mqDQBWpHzmtd+GFqvqT+ZowGfq3Pwkjdix5KxcNFH4I0JQUsUgCbxQO9mLj4hUQqCpcC gH2lNaazG1kDAkKgSc5wbQnrvqycTkB/8tCwcVc0sC8oxnvcyvhh79NsToyw/ePp1qol eW7XUNyEWJI/rued2KPJkUBd0IB/wMyPwW9xrGeyflyoLzpRn3w9+ogT+xpSP9yQwpvk 78cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m4a685HUG50oDycdiMz8MX8zwTLJNRbcKkuniaQymBg=; b=b4OQQRoYvlbjZ9i1QHqTh5TOlQ9+iWvpyy7kEfT76EcgVS0axER+2CrxYIT8tE0MQn nwTKT5U3wDSUMoEwxFO7lC+1YtfH33oSmmrRJM9gS76RbJARWo/JzGc6b9/IG1finSTs iKt2gEzn0WglgXqnVM623FPVgtuBQ88fAdqd4QS8mSUquG8LZHEjNV+P//Nt9c7mZk37 rmIV5JDSvVBFcO4llr9mQZpeYSxSsrusRHwEzbIRE1rokxj6yZblc3fOtRwC64cqRgwI w30U+q35E66mzsnc5zqBswqDlpzwSPGtIMi8cZezMkMVrmpuuj6mrw+ZjET9PIhev4CT qIIA== X-Gm-Message-State: AOAM532i8keEYeaNV5fumearhfBzUOuAbCGhaD8uEwD6Ig/iyJES5WfO il1Ml6tiF3wQFpmA9wNKrADJwwMBejU= X-Google-Smtp-Source: ABdhPJwItLozJEM/PSo39Kr1OzMeR5J+B7pUINjjCzGDndlLp+Bs4RbaeX5nZ1BzGIvLGzrow0yfqQ== X-Received: by 2002:aa7:9d1c:0:b029:1f1:53b2:a5b0 with SMTP id k28-20020aa79d1c0000b02901f153b2a5b0mr14392083pfp.13.1615896297451; Tue, 16 Mar 2021 05:04:57 -0700 (PDT) From: Bin Meng To: Jason Wang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , qemu-devel@nongnu.org Subject: [PATCH v4 11/12] hw/net: sungem: Remove the logic of padding short frames in the receive path Date: Tue, 16 Mar 2021 20:04:19 +0800 Message-Id: <20210316120420.19658-12-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210316120420.19658-1-bmeng.cn@gmail.com> References: <20210316120420.19658-1-bmeng.cn@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::52c; envelope-from=bmeng.cn@gmail.com; helo=mail-pg1-x52c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Bin Meng Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Type: text/plain; charset="utf-8" Now that we have implemented unified short frames padding in the QEMU networking codes, remove the same logic in the NIC codes. Signed-off-by: Bin Meng --- (no changes since v1) hw/net/sungem.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/hw/net/sungem.c b/hw/net/sungem.c index 33c3722df6..3fa83168db 100644 --- a/hw/net/sungem.c +++ b/hw/net/sungem.c @@ -550,7 +550,6 @@ static ssize_t sungem_receive(NetClientState *nc, const= uint8_t *buf, PCIDevice *d =3D PCI_DEVICE(s); uint32_t mac_crc, done, kick, max_fsize; uint32_t fcs_size, ints, rxdma_cfg, rxmac_cfg, csum, coff; - uint8_t smallbuf[60]; struct gem_rxd desc; uint64_t dbase, baddr; unsigned int rx_cond; @@ -584,19 +583,6 @@ static ssize_t sungem_receive(NetClientState *nc, cons= t uint8_t *buf, return size; } =20 - /* We don't drop too small frames since we get them in qemu, we pad - * them instead. We should probably use the min frame size register - * but I don't want to use a variable size staging buffer and I - * know both MacOS and Linux use the default 64 anyway. We use 60 - * here to account for the non-existent FCS. - */ - if (size < 60) { - memcpy(smallbuf, buf, size); - memset(&smallbuf[size], 0, 60 - size); - buf =3D smallbuf; - size =3D 60; - } - /* Get MAC crc */ mac_crc =3D net_crc32_le(buf, ETH_ALEN); =20 --=20 2.25.1