VIRTIO_NET_HDR_F_RSC_INFO in virtio-net vs headers update

[Cornelia Huck]

Hi,

I'm currently trying to prepare a linux-headers update to 5.7-rc3,
which adds the definition of VIRTIO_NET_HDR_F_RSC_INFO.

Unfortunately, this breaks the build of virtio-net, because now
virtio_net_rsc_ext_num_{packets,dupacks} are undefined (they are
guarded by existence of VIRTIO_NET_HDR_F_RSC_INFO).

What is the right way to fix this? Remove the constants that are now
provided by the header and keep the definitions of
virtio_net_rsc_ext_num_{packets,dupacks}?

[I'd like to queue a headers update as soon as possible, as the whole
s390 protected virt stuff depends on it...]