qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: bmeng.cn@gmail.com
To: Jason Wang <jasowang@redhat.com>, qemu-devel@nongnu.org
Cc: Bin Meng <bmeng.cn@gmail.com>, Bin Meng <bmeng@tinylab.org>
Subject: [PATCH v6 6/8] hw/net: rtl8139: Remove the logic of padding short frames in the receive path
Date: Wed,  1 Mar 2023 17:02:01 +0800	[thread overview]
Message-ID: <20230301090203.1601925-7-bmeng.cn@gmail.com> (raw)
In-Reply-To: <20230301090203.1601925-1-bmeng.cn@gmail.com>

From: Bin Meng <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>
Signed-off-by: Bin Meng <bmeng@tinylab.org>
---

 hw/net/rtl8139.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index 5a5aaf868d..a52b961bda 100644
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -826,7 +826,6 @@ static ssize_t rtl8139_do_receive(NetClientState *nc, const uint8_t *buf, size_t
 
     uint32_t packet_header = 0;
 
-    uint8_t buf1[MIN_BUF_SIZE + VLAN_HLEN];
     static const uint8_t broadcast_macaddr[6] =
         { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 
@@ -938,17 +937,6 @@ static ssize_t rtl8139_do_receive(NetClientState *nc, const uint8_t *buf, size_t
         }
     }
 
-    /* if too small buffer, then expand it
-     * Include some tailroom in case a vlan tag is later removed. */
-    if (size < MIN_BUF_SIZE + VLAN_HLEN) {
-        memcpy(buf1, buf, size);
-        memset(buf1 + size, 0, MIN_BUF_SIZE + VLAN_HLEN - size);
-        buf = buf1;
-        if (size < MIN_BUF_SIZE) {
-            size = MIN_BUF_SIZE;
-        }
-    }
-
     if (rtl8139_cp_receiver_enabled(s))
     {
         if (!rtl8139_cp_rx_valid(s)) {
-- 
2.34.1



  parent reply	other threads:[~2023-03-01  9:03 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-01  9:01 [PATCH v6 0/8] net: Pad short frames for network backends bmeng.cn
2023-03-01  9:01 ` [PATCH v6 1/8] hw/net: e1000: Remove the logic of padding short frames in the receive path bmeng.cn
2023-03-01  9:01 ` [PATCH v6 2/8] hw/net: vmxnet3: " bmeng.cn
2023-03-01  9:01 ` [PATCH v6 3/8] hw/net: i82596: " bmeng.cn
2023-03-01  9:01 ` [PATCH v6 4/8] hw/net: ne2000: " bmeng.cn
2023-03-01  9:02 ` [PATCH v6 5/8] hw/net: pcnet: " bmeng.cn
2023-03-01  9:02 ` bmeng.cn [this message]
2023-03-01  9:02 ` [PATCH v6 7/8] hw/net: sungem: " bmeng.cn
2023-03-01  9:02 ` [PATCH v6 8/8] hw/net: sunhme: " bmeng.cn
2023-03-01  9:12 ` [PATCH v6 0/8] net: Pad short frames for network backends Cédric Le Goater
2023-03-01 10:20   ` 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=20230301090203.1601925-7-bmeng.cn@gmail.com \
    --to=bmeng.cn@gmail.com \
    --cc=bmeng@tinylab.org \
    --cc=jasowang@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).