|
@@ -1030,7 +1030,8 @@ static int vhost_net_set_features(struct vhost_net *n, u64 features)
|
|
size_t vhost_hlen, sock_hlen, hdr_len;
|
|
size_t vhost_hlen, sock_hlen, hdr_len;
|
|
int i;
|
|
int i;
|
|
|
|
|
|
- hdr_len = (features & (1 << VIRTIO_NET_F_MRG_RXBUF)) ?
|
|
|
|
|
|
+ hdr_len = (features & ((1ULL << VIRTIO_NET_F_MRG_RXBUF) |
|
|
|
|
+ (1ULL << VIRTIO_F_VERSION_1))) ?
|
|
sizeof(struct virtio_net_hdr_mrg_rxbuf) :
|
|
sizeof(struct virtio_net_hdr_mrg_rxbuf) :
|
|
sizeof(struct virtio_net_hdr);
|
|
sizeof(struct virtio_net_hdr);
|
|
if (features & (1 << VHOST_NET_F_VIRTIO_NET_HDR)) {
|
|
if (features & (1 << VHOST_NET_F_VIRTIO_NET_HDR)) {
|