From 416b90bf47dc6988b628abe55fb27668260e4742 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 3 Jun 2024 09:51:34 +0000 Subject: [PATCH] Revert "vsock/virtio: fix packet delivery to tap device" This reverts commit db388b8e12aa7c3660617cc5e8beb90f71bba206 which is commit b32a09ea7c38849ff925489a6bf5bd8914bc45df upstream. It breaks the build due to previous reverts of ABI breaking changes in the virtio_transport.c driver. This is safe to revert here as this driver is not used in GKI kernels, only in test builds. Bug: 161946584 Change-Id: Iad31e3a4d4a7b88469cbfa2aa2635bcf61295bd4 Signed-off-by: Greg Kroah-Hartman --- net/vmw_vsock/virtio_transport.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c index 10528081e800..460e7fbb42da 100644 --- a/net/vmw_vsock/virtio_transport.c +++ b/net/vmw_vsock/virtio_transport.c @@ -139,8 +139,6 @@ virtio_transport_send_pkt_work(struct work_struct *work) break; } - virtio_transport_deliver_tap_pkt(skb); - if (reply) { struct virtqueue *rx_vq = vsock->vqs[VSOCK_VQ_RX]; int val;