Merge tag 'metag-for-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan...

[karo-tx-linux.git] / net / vmw_vsock / virtio_transport.c

diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c
index 68675a151f22b8b63c02b25a67b833d9a6046d84..403d86e80162e7796fd75249b1ae876d1eee1e6a 100644 (file)
--- a/net/vmw_vsock/virtio_transport.c
+++ b/net/vmw_vsock/virtio_transport.c
@@ -144,6 +144,8 @@ virtio_transport_send_pkt_work(struct work_struct *work)
                list_del_init(&pkt->list);
                spin_unlock_bh(&vsock->send_pkt_list_lock);
 
+               virtio_transport_deliver_tap_pkt(pkt);
+
                reply = pkt->reply;
 
                sg_init_one(&hdr, &pkt->hdr, sizeof(pkt->hdr));
@@ -370,6 +372,7 @@ static void virtio_transport_rx_work(struct work_struct *work)
                        }
 
                        pkt->len = len - sizeof(pkt->hdr);
+                       virtio_transport_deliver_tap_pkt(pkt);
                        virtio_transport_recv_pkt(pkt);
                }
        } while (!virtqueue_enable_cb(vq));
@@ -573,9 +576,9 @@ static int virtio_vsock_probe(struct virtio_device *vdev)
 
        vsock->vdev = vdev;
 
-       ret = vsock->vdev->config->find_vqs(vsock->vdev, VSOCK_VQ_MAX,
-                                           vsock->vqs, callbacks, names,
-                                           NULL);
+       ret = virtio_find_vqs(vsock->vdev, VSOCK_VQ_MAX,
+                             vsock->vqs, callbacks, names,
+                             NULL);
        if (ret < 0)
                goto out;