From nobody Wed Nov 19 13:38:45 2025 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=1615962877; cv=none; d=zohomail.com; s=zohoarc; b=Us8SMlEpEKLum3X4WOC+YMbk1IqBME2aqG2JixozTpHv0mtaSMnsFLK7CVJvypaxlfRAJDVjBBWsVjt/gJb9etCatIVIpG+++J8cKwYYNYf9Ffp4RpjBxx70Muabo0xqslrZQPuVZ5p12EKP6/pgb99+ycrxt3Mar8oZASNdGzg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615962877; h=Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=6g2fqKS4zXXBGv4/b0aMoziWaN2OpwusnZLdMFaob9Y=; b=WqScsJKl2gfVy53mREl8ywO4YFL/bK+RoIAZDO5yPbU5ZGmrs4PbyVjpEMtwsessuapHWMx4SCKs5+6RpFhwfey87pChzE4CMHhmAbXTTfN9MfWz3vhpfKV2VjzbWwYLztOTjiSXtKoDcGYg5nEQOr+KsPYJiUiQcvem1bTQ/IA= 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 161596287706647.20374398425963; Tue, 16 Mar 2021 23:34:37 -0700 (PDT) Received: from localhost ([::1]:38738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMPlL-0000L8-Cx for importer@patchew.org; Wed, 17 Mar 2021 02:34:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMPeU-0003y3-Fk for qemu-devel@nongnu.org; Wed, 17 Mar 2021 02:27:30 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]:42345) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lMPeL-0000Cj-Ie for qemu-devel@nongnu.org; Wed, 17 Mar 2021 02:27:30 -0400 Received: by mail-ej1-x62e.google.com with SMTP id c10so719638ejx.9 for ; Tue, 16 Mar 2021 23:27:18 -0700 (PDT) Received: from pek-vx-bsp9.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id d1sm10751349eje.26.2021.03.16.23.27.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Mar 2021 23:27:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=6g2fqKS4zXXBGv4/b0aMoziWaN2OpwusnZLdMFaob9Y=; b=WZ5d4RZnhj/I+wE6HFgD0GoX9myoCnPGqSBF7xXwAAL8VOFeCd/Rn2ZE7WWAA8EiBj 3RqbZcp9Xb33WykZ0ENfjLVBfLi8so33J9FmpgvzWdwL97UhGvBT4RRLHOJv8OnXG95m u7Ah/NDyCZ2/wwtgRatYaFs3AbPtYRSj7us3M/fYyG//uGzh96cnI+OtPm4f6NPpGYSV RPhLkR6paPn7Ol0/A0QZsrdYrcjmj5cUhS3yXMZDhVXwAJmHsPfB6ZmFxoWIeABuhLO/ GR1X6mOG529xkFxUIkXKpDi2wKtZxD4tQ45LekhLxOwHM/mOzW0oHX6aw7wHnjxGOl6T VO9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=6g2fqKS4zXXBGv4/b0aMoziWaN2OpwusnZLdMFaob9Y=; b=rJ4ZEYGCvB//cIop9QOkyWuan9+lXkgVPv+Cts5TuWh6ww+v1yeOfB25H+x5vlg0AP uHjxTFmNR+2a1r6uQjgLIf/RLDzVkGbVRAUB/fjngCZFgn1650cDkB1JfyE/l79W1Y7p cW5Ke7+YQyWWE20GY4lDcUyD4RnX9VMHJv4dFAEoH1W0psGuaxGFYmt5eQ6Axzf3GuZj 6V2xX8JUAMIxLCw/RBpvlmqJGX/abKiDbbXKtACKUv0BtxKJAGtbTALPX/QnpyWSjV5e tnjy0vfOQ3GxqdjuBR9vG0vd2o+ATA0tRr3b7IhjrscEC8igDpdlRn88FudJw5oAW2bk DecA== X-Gm-Message-State: AOAM5335lD04ALlUQd6yWha98v9ZALrT9W4M1oM1mqS53s46dpNnMi+I 8MCe1u4Cw27g03Ws/wKFfk8= X-Google-Smtp-Source: ABdhPJzN08UjEbB07QRi38GGBJczNjZX0joiYMKgpx8mkAVnl51CTWUIwwJiHfYll+9XE1ffJEz4KQ== X-Received: by 2002:a17:906:9be1:: with SMTP id de33mr34946540ejc.320.1615962437901; Tue, 16 Mar 2021 23:27:17 -0700 (PDT) From: Bin Meng To: Jason Wang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , qemu-devel@nongnu.org Subject: [PATCH v5 07/12] hw/net: i82596: Remove the logic of padding short frames in the receive path Date: Wed, 17 Mar 2021 14:26:33 +0800 Message-Id: <20210317062638.72626-8-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210317062638.72626-1-bmeng.cn@gmail.com> References: <20210317062638.72626-1-bmeng.cn@gmail.com> 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=2a00:1450:4864:20::62e; envelope-from=bmeng.cn@gmail.com; helo=mail-ej1-x62e.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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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/i82596.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/hw/net/i82596.c b/hw/net/i82596.c index 055c3a1470..1eca2e2d81 100644 --- a/hw/net/i82596.c +++ b/hw/net/i82596.c @@ -73,10 +73,6 @@ enum commands { #define I596_EOF 0x8000 #define SIZE_MASK 0x3fff =20 -#define ETHER_TYPE_LEN 2 -#define VLAN_TCI_LEN 2 -#define VLAN_HLEN (ETHER_TYPE_LEN + VLAN_TCI_LEN) - /* various flags in the chip config registers */ #define I596_PREFETCH (s->config[0] & 0x80) #define I596_PROMISC (s->config[8] & 0x01) @@ -489,8 +485,6 @@ bool i82596_can_receive(NetClientState *nc) return true; } =20 -#define MIN_BUF_SIZE 60 - ssize_t i82596_receive(NetClientState *nc, const uint8_t *buf, size_t sz) { I82596State *s =3D qemu_get_nic_opaque(nc); @@ -501,7 +495,6 @@ ssize_t i82596_receive(NetClientState *nc, const uint8_= t *buf, size_t sz) size_t bufsz =3D sz; /* length of data in buf */ uint32_t crc; uint8_t *crc_ptr; - uint8_t buf1[MIN_BUF_SIZE + VLAN_HLEN]; static const uint8_t broadcast_macaddr[6] =3D { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; =20 @@ -584,17 +577,6 @@ ssize_t i82596_receive(NetClientState *nc, const uint8= _t *buf, size_t sz) } } =20 - /* if too small buffer, then expand it */ - if (len < MIN_BUF_SIZE + VLAN_HLEN) { - memcpy(buf1, buf, len); - memset(buf1 + len, 0, MIN_BUF_SIZE + VLAN_HLEN - len); - buf =3D buf1; - if (len < MIN_BUF_SIZE) { - len =3D MIN_BUF_SIZE; - } - bufsz =3D len; - } - /* Calculate the ethernet checksum (4 bytes) */ len +=3D 4; crc =3D cpu_to_be32(crc32(~0, buf, sz)); --=20 2.17.1