From: Akihiko Odaki <akihiko.odaki@daynix.com>
Date: Sun, 28 Apr 2024 07:00:49 +0000 (+0900)
Subject: tap: Shrink zeroed virtio-net header
X-Git-Tag: v9.1.0-rc0~85^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77db537995be8bcab215a99bc9c1b51066b56557;p=thirdparty%2Fqemu.git

tap: Shrink zeroed virtio-net header

tap prepends a zeroed virtio-net header when writing a packet to a
tap with virtio-net header enabled but not in use. This only happens
when s->host_vnet_hdr_len == sizeof(struct virtio_net_hdr).

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---

diff --git a/net/tap.c b/net/tap.c
index 9825518ff1f..51f7aec39d9 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -119,7 +119,7 @@ static ssize_t tap_receive_iov(NetClientState *nc, const struct iovec *iov,
     TAPState *s = DO_UPCAST(TAPState, nc, nc);
     const struct iovec *iovp = iov;
     g_autofree struct iovec *iov_copy = NULL;
-    struct virtio_net_hdr_mrg_rxbuf hdr = { };
+    struct virtio_net_hdr hdr = { };
 
     if (s->host_vnet_hdr_len && !s->using_vnet_hdr) {
         iov_copy = g_new(struct iovec, iovcnt + 1);