From: Cornelia Huck <cohuck@redhat.com>
To: "Michael S . Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: Yuri Benditovich <yuri.benditovich@daynix.com>,
Cornelia Huck <cohuck@redhat.com>,
qemu-devel@nongnu.org
Subject: [PATCH 1/3] virtio-net: fix rsc_ext compat handling
Date: Mon, 27 Apr 2020 12:24:13 +0200 [thread overview]
Message-ID: <20200427102415.10915-2-cohuck@redhat.com> (raw)
In-Reply-To: <20200427102415.10915-1-cohuck@redhat.com>
virtio_net_rsc_ext_num_{packets,dupacks} needs to be available
independently of the presence of VIRTIO_NET_HDR_F_RSC_INFO.
Fixes: 2974e916df87 ("virtio-net: support RSC v4/v6 tcp traffic for Windows HCK")
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
hw/net/virtio-net.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index a46e3b37a7cd..e85d902588b3 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -83,6 +83,8 @@
#define VIRTIO_NET_HDR_F_RSC_INFO 4 /* rsc_ext data in csum_ fields */
#define VIRTIO_NET_F_RSC_EXT 61
+#endif
+
static inline __virtio16 *virtio_net_rsc_ext_num_packets(
struct virtio_net_hdr *hdr)
{
@@ -95,8 +97,6 @@ static inline __virtio16 *virtio_net_rsc_ext_num_dupacks(
return &hdr->csum_offset;
}
-#endif
-
static VirtIOFeature feature_sizes[] = {
{.flags = 1ULL << VIRTIO_NET_F_MAC,
.end = endof(struct virtio_net_config, mac)},
--
2.21.1
next prev parent reply other threads:[~2020-04-27 10:27 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-27 10:24 [PATCH 0/3] headers update and virtio-net fixup Cornelia Huck
2020-04-27 10:24 ` Cornelia Huck [this message]
2020-04-27 10:24 ` [PATCH 2/3] linux-headers: update against Linux 5.7-rc3 Cornelia Huck
2020-04-27 11:31 ` Michael S. Tsirkin
2020-04-27 10:24 ` [PATCH 3/3] virtio-net: remove VIRTIO_NET_HDR_F_RSC_INFO compat handling Cornelia Huck
2020-04-27 11:32 ` Michael S. Tsirkin
2020-04-28 8:19 ` Jason Wang
2020-04-28 8:34 ` Cornelia Huck
2020-04-28 8:58 ` Jason Wang
2020-04-28 9:18 ` Cornelia Huck
2020-04-28 10:55 ` Yuri Benditovich
2020-04-28 13:04 ` Jason Wang
2020-04-28 13:00 ` Jason Wang
2020-04-27 11:29 ` [PATCH 0/3] headers update and virtio-net fixup Michael S. Tsirkin
2020-04-28 11:35 ` Cornelia Huck
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=20200427102415.10915-2-cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=jasowang@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=yuri.benditovich@daynix.com \
/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.