All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bin Meng <bmeng.cn@gmail.com>
To: "Jason Wang" <jasowang@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	qemu-devel@nongnu.org
Cc: Bin Meng <bmeng.cn@gmail.com>
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	[thread overview]
Message-ID: <20210316120420.19658-12-bmeng.cn@gmail.com> (raw)
In-Reply-To: <20210316120420.19658-1-bmeng.cn@gmail.com>

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 <bmeng.cn@gmail.com>
---

(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 = 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, const uint8_t *buf,
         return size;
     }
 
-    /* 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 = smallbuf;
-        size = 60;
-    }
-
     /* Get MAC crc */
     mac_crc = net_crc32_le(buf, ETH_ALEN);
 
-- 
2.25.1



  parent reply	other threads:[~2021-03-16 12:15 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-16 12:04 [PATCH v4 00/12] net: Pad short frames for network backends Bin Meng
2021-03-16 12:04 ` [PATCH v4 01/12] net: eth: Add a helper to pad a short Ethernet frame Bin Meng
2021-03-16 15:09   ` Philippe Mathieu-Daudé
2021-03-17  6:22     ` Bin Meng
2021-03-16 12:04 ` [PATCH v4 02/12] net: Add a 'do_not_pad" to NetClientState Bin Meng
2021-03-16 12:04 ` [PATCH v4 03/12] net: Pad short frames to minimum size before sending from SLiRP/TAP Bin Meng
2021-03-16 15:10   ` Philippe Mathieu-Daudé
2021-03-16 12:04 ` [PATCH v4 04/12] hw/net: virtio-net: Initialize nc->do_not_pad to true Bin Meng
2021-03-16 12:04 ` [PATCH v4 05/12] hw/net: e1000: Remove the logic of padding short frames in the receive path Bin Meng
2021-03-16 12:04 ` [PATCH v4 06/12] hw/net: vmxnet3: " Bin Meng
2021-03-16 12:04 ` [PATCH v4 07/12] hw/net: i82596: " Bin Meng
2021-03-16 12:04 ` [PATCH v4 08/12] hw/net: ne2000: " Bin Meng
2021-03-16 12:04 ` [PATCH v4 09/12] hw/net: pcnet: " Bin Meng
2021-03-16 12:04 ` [PATCH v4 10/12] hw/net: rtl8139: " Bin Meng
2021-03-16 12:04 ` Bin Meng [this message]
2021-03-16 12:04 ` [PATCH v4 12/12] hw/net: sunhme: " Bin Meng

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210316120420.19658-12-bmeng.cn@gmail.com \
    --to=bmeng.cn@gmail.com \
    --cc=jasowang@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.