From d8f47fdda23c36eef7b992b190c0505e3715de83 Mon Sep 17 00:00:00 2001
From: Pim van Pelt <pim@ipng.ch>
Date: Tue, 10 Feb 2026 22:39:14 +0100
Subject: [PATCH] Refactor tap into its own plugin (upstream commit cb19c526d)

---
 lcpng_interface.c | 7 ++-----
 lcpng_nl_sync.c   | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/lcpng_interface.c b/lcpng_interface.c
index 70a144b..a7c7370 100644
--- a/lcpng_interface.c
+++ b/lcpng_interface.c
@@ -33,7 +33,7 @@
 #include <vnet/adj/adj_mcast.h>
 #include <vnet/udp/udp.h>
 #include <vnet/tcp/tcp.h>
-#include <vnet/devices/tap/tap.h>
+#include <tap/tap.h>
 #include <vnet/devices/virtio/virtio.h>
 #include <vnet/devices/netlink.h>
 #include <vlibapi/api_helper_macros.h>
@@ -1060,10 +1060,7 @@ lcp_itf_pair_create (u32 phy_sw_if_index, u8 *host_if_name,
        * get the hw and ethernet of the tap
        */
       hw = vnet_get_sup_hw_interface (vnm, args.sw_if_index);
-
-      virtio_main_t *mm = &virtio_main;
-      virtio_if_t *vif = pool_elt_at_index (mm->interfaces, hw->dev_instance);
-      vif_index = vif->ifindex;
+      vif_index = tap_get_ifindex (vm, args.sw_if_index);
 
       /*
        * force the tap in promiscuous mode.
diff --git a/lcpng_nl_sync.c b/lcpng_nl_sync.c
index f34b0f3..d9d4128 100644
--- a/lcpng_nl_sync.c
+++ b/lcpng_nl_sync.c
@@ -28,7 +28,7 @@
 #include <plugins/lcpng/lcpng_interface.h>
 #include <plugins/lcpng/lcpng_netlink.h>
 
-#include <vnet/devices/tap/tap.h>
+#include <tap/tap.h>
 #include <vnet/fib/fib_table.h>
 #include <vnet/mfib/mfib_table.h>
 #include <vnet/ip/ip6_ll_table.h>