[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 7/7] virtio-net: align RSC fields with updated virtio-net header
From: |
Yuri Benditovich |
Subject: |
[PATCH 7/7] virtio-net: align RSC fields with updated virtio-net header |
Date: |
Fri, 8 May 2020 15:54:52 +0300 |
Removal of duplicated RSC definitions. Changing names of the
fields to ones defined in the Linux header.
Signed-off-by: Yuri Benditovich <address@hidden>
---
hw/net/virtio-net.c | 28 ++++------------------------
1 file changed, 4 insertions(+), 24 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index c263b1511d..10b4ba50ad 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -88,26 +88,6 @@
VIRTIO_NET_RSS_HASH_TYPE_TCP_EX | \
VIRTIO_NET_RSS_HASH_TYPE_UDP_EX)
-/* temporary until standard header include it */
-#if !defined(VIRTIO_NET_HDR_F_RSC_INFO)
-
-#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)
-{
- return &hdr->csum_start;
-}
-
-static inline __virtio16 *virtio_net_rsc_ext_num_dupacks(
- struct virtio_net_hdr *hdr)
-{
- return &hdr->csum_offset;
-}
-
static VirtIOFeature feature_sizes[] = {
{.flags = 1ULL << VIRTIO_NET_F_MAC,
.end = endof(struct virtio_net_config, mac)},
@@ -1821,15 +1801,15 @@ static size_t
virtio_net_rsc_drain_seg(VirtioNetRscChain *chain,
VirtioNetRscSeg *seg)
{
int ret;
- struct virtio_net_hdr *h;
+ struct virtio_net_hdr_v1 *h;
- h = (struct virtio_net_hdr *)seg->buf;
+ h = (struct virtio_net_hdr_v1 *)seg->buf;
h->flags = 0;
h->gso_type = VIRTIO_NET_HDR_GSO_NONE;
if (seg->is_coalesced) {
- *virtio_net_rsc_ext_num_packets(h) = seg->packets;
- *virtio_net_rsc_ext_num_dupacks(h) = seg->dup_ack;
+ h->rsc.segments = seg->packets;
+ h->rsc.dup_acks = seg->dup_ack;
h->flags = VIRTIO_NET_HDR_F_RSC_INFO;
if (chain->proto == ETH_P_IP) {
h->gso_type = VIRTIO_NET_HDR_GSO_TCPV4;
--
2.17.1
- [PATCH 0/7] reference implementation of RSS and hash report, Yuri Benditovich, 2020/05/08
- [PATCH 1/7] virtio-net: implement RSS configuration command, Yuri Benditovich, 2020/05/08
- [PATCH 3/7] tap: allow extended virtio header with hash info, Yuri Benditovich, 2020/05/08
- [PATCH 2/7] virtio-net: implement RX RSS processing, Yuri Benditovich, 2020/05/08
- [PATCH 4/7] virtio-net: reference implementation of hash report, Yuri Benditovich, 2020/05/08
- [PATCH 5/7] vmstate.h: provide VMSTATE_VARRAY_UINT16_ALLOC macro, Yuri Benditovich, 2020/05/08
- [PATCH 7/7] virtio-net: align RSC fields with updated virtio-net header,
Yuri Benditovich <=
- [PATCH 6/7] virtio-net: add migration support for RSS and hash report, Yuri Benditovich, 2020/05/08
- Re: [PATCH 0/7] reference implementation of RSS and hash report, Yuri Benditovich, 2020/05/08