qemu-devel.nongnu.org archive mirror
 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 <bin.meng@windriver.com>
Subject: [RFC PATCH v2 9/9] hw/net: sunhme: Remove the logic of padding short frames in the receive path
Date: Wed,  3 Mar 2021 17:21:46 +0800	[thread overview]
Message-ID: <1614763306-18026-10-git-send-email-bmeng.cn@gmail.com> (raw)
In-Reply-To: <1614763306-18026-1-git-send-email-bmeng.cn@gmail.com>

From: Bin Meng <bin.meng@windriver.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 <bin.meng@windriver.com>

---

(no changes since v1)

 hw/net/sunhme.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/hw/net/sunhme.c b/hw/net/sunhme.c
index fc34905..6971796 100644
--- a/hw/net/sunhme.c
+++ b/hw/net/sunhme.c
@@ -714,8 +714,6 @@ static inline void sunhme_set_rx_ring_nr(SunHMEState *s, int i)
     s->erxregs[HME_ERXI_RING >> 2] = ring;
 }
 
-#define MIN_BUF_SIZE 60
-
 static ssize_t sunhme_receive(NetClientState *nc, const uint8_t *buf,
                               size_t size)
 {
@@ -724,7 +722,6 @@ static ssize_t sunhme_receive(NetClientState *nc, const uint8_t *buf,
     dma_addr_t rb, addr;
     uint32_t intstatus, status, buffer, buffersize, sum;
     uint16_t csum;
-    uint8_t buf1[60];
     int nr, cr, len, rxoffset, csum_offset;
 
     trace_sunhme_rx_incoming(size);
@@ -775,14 +772,6 @@ static ssize_t sunhme_receive(NetClientState *nc, const uint8_t *buf,
 
     trace_sunhme_rx_filter_accept();
 
-    /* If too small buffer, then expand it */
-    if (size < MIN_BUF_SIZE) {
-        memcpy(buf1, buf, size);
-        memset(buf1 + size, 0, MIN_BUF_SIZE - size);
-        buf = buf1;
-        size = MIN_BUF_SIZE;
-    }
-
     rb = s->erxregs[HME_ERXI_RING >> 2] & HME_ERXI_RING_ADDR;
     nr = sunhme_get_rx_ring_count(s);
     cr = sunhme_get_rx_ring_nr(s);
-- 
2.7.4



      parent reply	other threads:[~2021-03-03  9:29 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-03  9:21 [RFC PATCH v2 0/9] net: Handle short frames for SLiRP/TAP interfaces Bin Meng
2021-03-03  9:21 ` [RFC PATCH v2 1/9] net: Pad short frames to minimum size before send from SLiRP/TAP Bin Meng
2021-03-03 10:15   ` Philippe Mathieu-Daudé
2021-03-03 10:31     ` Bin Meng
2021-03-03  9:21 ` [RFC PATCH v2 2/9] hw/net: e1000: Remove the logic of padding short frames in the receive path Bin Meng
2021-03-03  9:21 ` [RFC PATCH v2 3/9] hw/net: vmxnet3: " Bin Meng
2021-03-03  9:21 ` [RFC PATCH v2 4/9] hw/net: i82596: " Bin Meng
2021-03-03  9:21 ` [RFC PATCH v2 5/9] hw/net: ne2000: " Bin Meng
2021-03-03  9:21 ` [RFC PATCH v2 6/9] hw/net: pcnet: " Bin Meng
2021-03-03  9:21 ` [RFC PATCH v2 7/9] hw/net: rtl8139: " Bin Meng
2021-03-03  9:21 ` [RFC PATCH v2 8/9] hw/net: sungem: " Bin Meng
2021-03-03  9:21 ` Bin Meng [this message]

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=1614763306-18026-10-git-send-email-bmeng.cn@gmail.com \
    --to=bmeng.cn@gmail.com \
    --cc=bin.meng@windriver.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 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).