diff options
| author | Jason Wang <jasowang@redhat.com> | 2017-01-20 14:32:42 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-20 11:01:17 -0500 |
| commit | 6391a4481ba0796805d6581e42f9f0418c099e34 (patch) | |
| tree | f3636be425129c29943f31e61ead044c26b2854e /include/linux/virtio_net.h | |
| parent | 69fed99baac186013840ced3524562841296034f (diff) | |
| download | linux-stable-6391a4481ba0796805d6581e42f9f0418c099e34.tar.gz linux-stable-6391a4481ba0796805d6581e42f9f0418c099e34.tar.bz2 linux-stable-6391a4481ba0796805d6581e42f9f0418c099e34.zip | |
virtio-net: restore VIRTIO_HDR_F_DATA_VALID on receiving
Commit 501db511397f ("virtio: don't set VIRTIO_NET_HDR_F_DATA_VALID on
xmit") in fact disables VIRTIO_HDR_F_DATA_VALID on receiving path too,
fixing this by adding a hint (has_data_valid) and set it only on the
receiving path.
Cc: Rolf Neugebauer <rolf.neugebauer@docker.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Acked-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/virtio_net.h')
| -rw-r--r-- | include/linux/virtio_net.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h index 56436472ccc7..5209b5ed2a64 100644 --- a/include/linux/virtio_net.h +++ b/include/linux/virtio_net.h @@ -56,7 +56,8 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb, static inline int virtio_net_hdr_from_skb(const struct sk_buff *skb, struct virtio_net_hdr *hdr, - bool little_endian) + bool little_endian, + bool has_data_valid) { memset(hdr, 0, sizeof(*hdr)); /* no info leak */ @@ -91,6 +92,9 @@ static inline int virtio_net_hdr_from_skb(const struct sk_buff *skb, skb_checksum_start_offset(skb)); hdr->csum_offset = __cpu_to_virtio16(little_endian, skb->csum_offset); + } else if (has_data_valid && + skb->ip_summed == CHECKSUM_UNNECESSARY) { + hdr->flags = VIRTIO_NET_HDR_F_DATA_VALID; } /* else everything is zero */ return 0; |