summaryrefslogtreecommitdiffstats
path: root/net/packet
diff options
context:
space:
mode:
authorJason Wang <jasowang@redhat.com>2017-01-20 14:32:42 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-02-04 09:47:09 +0100
commit1e7cbb413f63d8fa790c8dabc208ce2a02339c26 (patch)
treedad47281f67d7c7a336f8264305504089a3f5cba /net/packet
parent3eab5dd0eb19b6ebed8ef7e7477d9f3048cc78fa (diff)
downloadlinux-stable-1e7cbb413f63d8fa790c8dabc208ce2a02339c26.tar.gz
linux-stable-1e7cbb413f63d8fa790c8dabc208ce2a02339c26.tar.bz2
linux-stable-1e7cbb413f63d8fa790c8dabc208ce2a02339c26.zip
virtio-net: restore VIRTIO_HDR_F_DATA_VALID on receiving
[ Upstream commit 6391a4481ba0796805d6581e42f9f0418c099e34 ] 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/packet')
-rw-r--r--net/packet/af_packet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index dd2332390c45..94e4a5941d89 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1972,7 +1972,7 @@ static int __packet_rcv_vnet(const struct sk_buff *skb,
{
*vnet_hdr = (const struct virtio_net_hdr) { 0 };
- if (virtio_net_hdr_from_skb(skb, vnet_hdr, vio_le()))
+ if (virtio_net_hdr_from_skb(skb, vnet_hdr, vio_le(), true))
BUG();
return 0;