3 files changed, 289 insertions, 278 deletions

diff --git a/emulators/virtualbox-ose-kmod-legacy/Makefile b/emulators/virtualbox-ose-kmod-legacy/Makefile
index 81d7ea4ab6ef..88b2b9633d94 100644
--- a/emulators/virtualbox-ose-kmod-legacy/Makefile
+++ b/emulators/virtualbox-ose-kmod-legacy/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	virtualbox-ose
 PORTVERSION=	5.2.44
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.oracle.com/virtualbox/${PORTVERSION}/
 PKGNAMESUFFIX=	-kmod-legacy
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c
deleted file mode 100644
index 4c0df373227c..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c
+++ /dev/null
@@ -1,273 +0,0 @@
---- src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c.orig	2018-10-15 14:30:58 UTC
-+++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c
-@@ -52,6 +52,7 @@
- #include <net/if_dl.h>
- #include <net/if_types.h>
- #include <net/ethernet.h>
-+#include <net/if_vlan_var.h>
- 
- #include <netgraph/ng_message.h>
- #include <netgraph/netgraph.h>
-@@ -73,6 +74,7 @@
- 
- #define VBOXNETFLT_OS_SPECFIC 1
- #include "../VBoxNetFltInternal.h"
-+#include "freebsd/the-freebsd-kernel.h"
- 
- static int vboxnetflt_modevent(struct module *, int, void *);
- static ng_constructor_t    ng_vboxnetflt_constructor;
-@@ -370,7 +372,11 @@ static int ng_vboxnetflt_rcvdata(hook_p hook, item_p i
-         mtx_lock_spin(&pThis->u.s.inq.ifq_mtx);
-         _IF_ENQUEUE(&pThis->u.s.inq, m);
-         mtx_unlock_spin(&pThis->u.s.inq.ifq_mtx);
-+#if __FreeBSD_version >= 1100100
-+        taskqueue_enqueue(taskqueue_fast, &pThis->u.s.tskin);
-+#else
-         taskqueue_enqueue_fast(taskqueue_fast, &pThis->u.s.tskin);
-+#endif
-     }
-     /*
-      * Handle mbufs on the outgoing hook, frames going to the interface
-@@ -388,7 +394,11 @@ static int ng_vboxnetflt_rcvdata(hook_p hook, item_p i
-         mtx_lock_spin(&pThis->u.s.outq.ifq_mtx);
-         _IF_ENQUEUE(&pThis->u.s.outq, m);
-         mtx_unlock_spin(&pThis->u.s.outq.ifq_mtx);
-+#if __FreeBSD_version >= 1100100
-+        taskqueue_enqueue(taskqueue_fast, &pThis->u.s.tskout);
-+#else
-         taskqueue_enqueue_fast(taskqueue_fast, &pThis->u.s.tskout);
-+#endif
-     }
-     else
-     {
-@@ -428,6 +438,8 @@ static void vboxNetFltFreeBSDinput(void *arg, int pend
-     struct ifnet *ifp = pThis->u.s.ifp;
-     unsigned int cSegs = 0;
-     bool fDropIt = false, fActive;
-+    bool is_vl_tagged = false;
-+    uint16_t vl_tag;
-     PINTNETSG pSG;
- 
-     VBOXCURVNET_SET(ifp->if_vnet);
-@@ -440,6 +452,19 @@ static void vboxNetFltFreeBSDinput(void *arg, int pend
-         if (m == NULL)
-             break;
- 
-+        /* Prepend a VLAN header for consumption by the virtual switch */
-+        if (m->m_flags & M_VLANTAG) {
-+            vl_tag = m->m_pkthdr.ether_vtag;
-+            is_vl_tagged = true;
-+
-+            m = ether_vlanencap(m, m->m_pkthdr.ether_vtag);
-+            if (m == NULL) {
-+                printf("vboxflt: unable to prepend VLAN header\n");
-+                break;
-+            }
-+            m->m_flags &= ~M_VLANTAG;
-+        }
-+
-         for (m0 = m; m0 != NULL; m0 = m0->m_next)
-             if (m0->m_len > 0)
-                 cSegs++;
-@@ -454,6 +479,27 @@ static void vboxNetFltFreeBSDinput(void *arg, int pend
-         vboxNetFltFreeBSDMBufToSG(pThis, m, pSG, cSegs, 0);
-         fDropIt = pThis->pSwitchPort->pfnRecv(pThis->pSwitchPort, NULL /* pvIf */, pSG, INTNETTRUNKDIR_WIRE);
-         RTMemTmpFree(pSG);
-+
-+        /* Restore the VLAN flags before re-injecting the packet */
-+        if (is_vl_tagged && !fDropIt) {
-+            struct ether_vlan_header *vl_hdr;
-+
-+            /* This shouldn't fail, as the header was just prepended */
-+            if (m->m_len < sizeof(*vl_hdr) && (m = m_pullup(m, sizeof(*vl_hdr))) == NULL) {
-+                printf("vboxflt: unable to pullup VLAN header\n");
-+                m_freem(m);
-+                break;
-+            }
-+
-+            /* Copy the MAC dhost/shost over the 802.1q field */
-+            vl_hdr = mtod(m, struct ether_vlan_header *);
-+            bcopy((char *)vl_hdr, (char *)vl_hdr + ETHER_VLAN_ENCAP_LEN, ETHER_HDR_LEN - ETHER_TYPE_LEN);
-+            m_adj(m, ETHER_VLAN_ENCAP_LEN);
-+
-+            m->m_pkthdr.ether_vtag = vl_tag;
-+            m->m_flags |= M_VLANTAG;
-+        }
-+
-         if (fDropIt)
-             m_freem(m);
-         else
-@@ -513,6 +559,7 @@ static void vboxNetFltFreeBSDoutput(void *arg, int pen
-  */
- int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *pvIfData, PINTNETSG pSG, uint32_t fDst)
- {
-+    IPRT_FREEBSD_SAVE_EFL_AC();
-     NOREF(pvIfData);
- 
-     void (*input_f)(struct ifnet *, struct mbuf *);
-@@ -529,10 +576,16 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
-     {
-         m = vboxNetFltFreeBSDSGMBufFromSG(pThis, pSG);
-         if (m == NULL)
-+        {
-+            IPRT_FREEBSD_RESTORE_EFL_AC();
-             return VERR_NO_MEMORY;
-+        }
-         m = m_pullup(m, ETHER_HDR_LEN);
-         if (m == NULL)
-+        {
-+            IPRT_FREEBSD_RESTORE_EFL_AC();
-             return VERR_NO_MEMORY;
-+        }
- 
-         m->m_flags |= M_PKTHDR;
-         ether_output_frame(ifp, m);
-@@ -542,10 +595,16 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
-     {
-         m = vboxNetFltFreeBSDSGMBufFromSG(pThis, pSG);
-         if (m == NULL)
-+        {
-+            IPRT_FREEBSD_RESTORE_EFL_AC();
-             return VERR_NO_MEMORY;
-+        }
-         m = m_pullup(m, ETHER_HDR_LEN);
-         if (m == NULL)
-+        {
-+            IPRT_FREEBSD_RESTORE_EFL_AC();
-             return VERR_NO_MEMORY;
-+        }
-         /*
-          * Delivering packets to the host will be captured by the
-          * input hook. Tag the packet with a mbuf tag so that we
-@@ -556,6 +615,7 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
-         if (mtag == NULL)
-         {
-             m_freem(m);
-+            IPRT_FREEBSD_RESTORE_EFL_AC();
-             return VERR_NO_MEMORY;
-         }
- 
-@@ -566,6 +626,7 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
-         ifp->if_input(ifp, m);
-     }
-     VBOXCURVNET_RESTORE();
-+    IPRT_FREEBSD_RESTORE_EFL_AC();
-     return VINF_SUCCESS;
- }
- 
-@@ -578,6 +639,7 @@ static bool vboxNetFltFreeBsdIsPromiscuous(PVBOXNETFLT
- 
- int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, void *pvContext)
- {
-+    IPRT_FREEBSD_SAVE_EFL_AC();
-     char nam[NG_NODESIZ];
-     struct ifnet *ifp;
-     node_p node;
-@@ -586,7 +648,10 @@ int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, voi
-     NOREF(pvContext);
-     ifp = ifunit(pThis->szName);
-     if (ifp == NULL)
-+    {
-+        IPRT_FREEBSD_RESTORE_EFL_AC();
-         return VERR_INTNET_FLT_IF_NOT_FOUND;
-+    }
- 
-     /* Create a new netgraph node for this instance */
-     if (ng_make_node_common(&ng_vboxnetflt_typestruct, &node) != 0)
-@@ -630,12 +695,14 @@ int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, voi
-         vboxNetFltRelease(pThis, true /*fBusy*/);
-     }
-     VBOXCURVNET_RESTORE();
-+    IPRT_FREEBSD_RESTORE_EFL_AC();
- 
-     return VINF_SUCCESS;
- }
- 
- bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThis)
- {
-+    IPRT_FREEBSD_SAVE_EFL_AC();
-     struct ifnet *ifp, *ifp0;
- 
-     ifp = ASMAtomicUoReadPtrT(&pThis->u.s.ifp, struct ifnet *);
-@@ -652,6 +719,7 @@ bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThi
-         pThis->u.s.node = NULL;
-     }
-     VBOXCURVNET_RESTORE();
-+    IPRT_FREEBSD_RESTORE_EFL_AC();
- 
-     if (ifp0 != NULL)
-     {
-@@ -664,6 +732,7 @@ bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThi
- 
- void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
- {
-+    IPRT_FREEBSD_SAVE_EFL_AC();
- 
-     taskqueue_drain(taskqueue_fast, &pThis->u.s.tskin);
-     taskqueue_drain(taskqueue_fast, &pThis->u.s.tskout);
-@@ -676,6 +745,7 @@ void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
-         ng_rmnode_self(pThis->u.s.node);
-     VBOXCURVNET_RESTORE();
-     pThis->u.s.node = NULL;
-+    IPRT_FREEBSD_RESTORE_EFL_AC();
- }
- 
- int vboxNetFltOsPreInitInstance(PVBOXNETFLTINS pThis)
-@@ -689,6 +759,7 @@ int vboxNetFltOsPreInitInstance(PVBOXNETFLTINS pThis)
- 
- void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, bool fActive)
- {
-+    IPRT_FREEBSD_SAVE_EFL_AC();
-     struct ifnet *ifp;
-     struct ifreq ifreq;
-     int error;
-@@ -722,7 +793,10 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
-         NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_CONNECT,
-             sizeof(struct ngm_connect), M_NOWAIT);
-         if (msg == NULL)
-+        {
-+            IPRT_FREEBSD_RESTORE_EFL_AC();
-             return;
-+        }
-         con = (struct ngm_connect *)msg->data;
-         snprintf(con->path, NG_PATHSIZ, "vboxnetflt_%s:", ifp->if_xname);
-         strlcpy(con->ourhook, "lower", NG_HOOKSIZ);
-@@ -736,7 +810,10 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
-         NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_CONNECT,
-             sizeof(struct ngm_connect), M_NOWAIT);
-         if (msg == NULL)
-+        {
-+            IPRT_FREEBSD_RESTORE_EFL_AC();
-             return;
-+        }
-         con = (struct ngm_connect *)msg->data;
-         snprintf(con->path, NG_PATHSIZ, "vboxnetflt_%s:",
-             ifp->if_xname);
-@@ -759,7 +836,10 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
-         NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_RMHOOK,
-             sizeof(struct ngm_rmhook), M_NOWAIT);
-         if (msg == NULL)
-+        {
-+            IPRT_FREEBSD_RESTORE_EFL_AC();
-             return;
-+        }
-         rm = (struct ngm_rmhook *)msg->data;
-         strlcpy(rm->ourhook, "input", NG_HOOKSIZ);
-         NG_SEND_MSG_PATH(error, node, msg, path, 0);
-@@ -770,12 +850,16 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
-         NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_RMHOOK,
-             sizeof(struct ngm_rmhook), M_NOWAIT);
-         if (msg == NULL)
-+        {
-+            IPRT_FREEBSD_RESTORE_EFL_AC();
-             return;
-+        }
-         rm = (struct ngm_rmhook *)msg->data;
-         strlcpy(rm->ourhook, "output", NG_HOOKSIZ);
-         NG_SEND_MSG_PATH(error, node, msg, path, 0);
-     }
-     VBOXCURVNET_RESTORE();
-+    IPRT_FREEBSD_RESTORE_EFL_AC();
- }
- 
- int vboxNetFltOsDisconnectIt(PVBOXNETFLTINS pThis)
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src_VBox_HostDrivers_VBoxNetFlt_freebsd_VBoxNetFlt-freebsd.c b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_HostDrivers_VBoxNetFlt_freebsd_VBoxNetFlt-freebsd.c
index 7476660805bb..7403c0cee559 100644
--- a/emulators/virtualbox-ose-legacy/files/patch-src_VBox_HostDrivers_VBoxNetFlt_freebsd_VBoxNetFlt-freebsd.c
+++ b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_HostDrivers_VBoxNetFlt_freebsd_VBoxNetFlt-freebsd.c
@@ -1,6 +1,39 @@
---- src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c.orig	2020-07-28 21:59:30.107638000 -0700
-+++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c	2020-07-28 22:00:37.858885000 -0700
-@@ -361,7 +361,14 @@
+--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c.orig	2021-06-14 19:17:49 UTC
++++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c
+@@ -52,6 +52,7 @@
+ #include <net/if_dl.h>
+ #include <net/if_types.h>
+ #include <net/ethernet.h>
++#include <net/if_vlan_var.h>
+ 
+ #include <netgraph/ng_message.h>
+ #include <netgraph/netgraph.h>
+@@ -73,6 +74,7 @@
+ 
+ #define VBOXNETFLT_OS_SPECFIC 1
+ #include "../VBoxNetFltInternal.h"
++#include "freebsd/the-freebsd-kernel.h"
+ 
+ static int vboxnetflt_modevent(struct module *, int, void *);
+ static ng_constructor_t    ng_vboxnetflt_constructor;
+@@ -149,6 +151,7 @@ NETGRAPH_INIT(vboxnetflt, &ng_vboxnetflt_typestruct);
+  */
+ MODULE_VERSION(vboxnetflt, 1);
+ MODULE_DEPEND(ng_vboxnetflt, vboxdrv, 1, 1, 1);
++MODULE_DEPEND(ng_vboxnetflt, ng_ether, 1, 1, 1);
+ 
+ /**
+  * The (common) global data.
+@@ -181,8 +184,6 @@ static int vboxnetflt_modevent(struct module *pMod, in
+                 printf("vboxNetFltInitGlobalsAndIdc failed %d\n", rc);
+                 return RTErrConvertToErrno(rc);
+             }
+-            /* No MODULE_VERSION in ng_ether so we can't MODULE_DEPEND it */
+-            kern_kldload(curthread, "ng_ether", NULL);
+             break;
+ 
+         case MOD_UNLOAD:
+@@ -361,7 +362,14 @@ static int ng_vboxnetflt_rcvdata(hook_p hook, item_p i
      {
          if (mtag != NULL || !fActive)
          {
@@ -15,7 +48,84 @@
              if (fActive)
                  vboxNetFltRelease(pThis, true /*fBusy*/);
              VBOXCURVNET_RESTORE();
-@@ -457,7 +464,16 @@
+@@ -370,7 +378,11 @@ static int ng_vboxnetflt_rcvdata(hook_p hook, item_p i
+         mtx_lock_spin(&pThis->u.s.inq.ifq_mtx);
+         _IF_ENQUEUE(&pThis->u.s.inq, m);
+         mtx_unlock_spin(&pThis->u.s.inq.ifq_mtx);
++#if __FreeBSD_version >= 1100100
++        taskqueue_enqueue(taskqueue_fast, &pThis->u.s.tskin);
++#else
+         taskqueue_enqueue_fast(taskqueue_fast, &pThis->u.s.tskin);
++#endif
+     }
+     /*
+      * Handle mbufs on the outgoing hook, frames going to the interface
+@@ -388,7 +400,11 @@ static int ng_vboxnetflt_rcvdata(hook_p hook, item_p i
+         mtx_lock_spin(&pThis->u.s.outq.ifq_mtx);
+         _IF_ENQUEUE(&pThis->u.s.outq, m);
+         mtx_unlock_spin(&pThis->u.s.outq.ifq_mtx);
++#if __FreeBSD_version >= 1100100
++        taskqueue_enqueue(taskqueue_fast, &pThis->u.s.tskout);
++#else
+         taskqueue_enqueue_fast(taskqueue_fast, &pThis->u.s.tskout);
++#endif
+     }
+     else
+     {
+@@ -428,6 +444,8 @@ static void vboxNetFltFreeBSDinput(void *arg, int pend
+     struct ifnet *ifp = pThis->u.s.ifp;
+     unsigned int cSegs = 0;
+     bool fDropIt = false, fActive;
++    bool is_vl_tagged = false;
++    uint16_t vl_tag;
+     PINTNETSG pSG;
+ 
+     VBOXCURVNET_SET(ifp->if_vnet);
+@@ -440,6 +458,19 @@ static void vboxNetFltFreeBSDinput(void *arg, int pend
+         if (m == NULL)
+             break;
+ 
++        /* Prepend a VLAN header for consumption by the virtual switch */
++        if (m->m_flags & M_VLANTAG) {
++            vl_tag = m->m_pkthdr.ether_vtag;
++            is_vl_tagged = true;
++
++            m = ether_vlanencap(m, m->m_pkthdr.ether_vtag);
++            if (m == NULL) {
++                printf("vboxflt: unable to prepend VLAN header\n");
++                break;
++            }
++            m->m_flags &= ~M_VLANTAG;
++        }
++
+         for (m0 = m; m0 != NULL; m0 = m0->m_next)
+             if (m0->m_len > 0)
+                 cSegs++;
+@@ -454,10 +485,40 @@ static void vboxNetFltFreeBSDinput(void *arg, int pend
+         vboxNetFltFreeBSDMBufToSG(pThis, m, pSG, cSegs, 0);
+         fDropIt = pThis->pSwitchPort->pfnRecv(pThis->pSwitchPort, NULL /* pvIf */, pSG, INTNETTRUNKDIR_WIRE);
+         RTMemTmpFree(pSG);
++
++        /* Restore the VLAN flags before re-injecting the packet */
++        if (is_vl_tagged && !fDropIt) {
++            struct ether_vlan_header *vl_hdr;
++
++            /* This shouldn't fail, as the header was just prepended */
++            if (m->m_len < sizeof(*vl_hdr) && (m = m_pullup(m, sizeof(*vl_hdr))) == NULL) {
++                printf("vboxflt: unable to pullup VLAN header\n");
++                m_freem(m);
++                break;
++            }
++
++            /* Copy the MAC dhost/shost over the 802.1q field */
++            vl_hdr = mtod(m, struct ether_vlan_header *);
++            bcopy((char *)vl_hdr, (char *)vl_hdr + ETHER_VLAN_ENCAP_LEN, ETHER_HDR_LEN - ETHER_TYPE_LEN);
++            m_adj(m, ETHER_VLAN_ENCAP_LEN);
++
++            m->m_pkthdr.ether_vtag = vl_tag;
++            m->m_flags |= M_VLANTAG;
++        }
++
          if (fDropIt)
              m_freem(m);
          else
@@ -32,3 +142,177 @@
      }
      vboxNetFltRelease(pThis, true /* fBusy */);
      VBOXCURVNET_RESTORE();
+@@ -513,6 +574,7 @@ static void vboxNetFltFreeBSDoutput(void *arg, int pen
+  */
+ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *pvIfData, PINTNETSG pSG, uint32_t fDst)
+ {
++    IPRT_FREEBSD_SAVE_EFL_AC();
+     NOREF(pvIfData);
+ 
+     void (*input_f)(struct ifnet *, struct mbuf *);
+@@ -529,10 +591,16 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
+     {
+         m = vboxNetFltFreeBSDSGMBufFromSG(pThis, pSG);
+         if (m == NULL)
++        {
++            IPRT_FREEBSD_RESTORE_EFL_AC();
+             return VERR_NO_MEMORY;
++        }
+         m = m_pullup(m, ETHER_HDR_LEN);
+         if (m == NULL)
++        {
++            IPRT_FREEBSD_RESTORE_EFL_AC();
+             return VERR_NO_MEMORY;
++        }
+ 
+         m->m_flags |= M_PKTHDR;
+         ether_output_frame(ifp, m);
+@@ -542,10 +610,16 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
+     {
+         m = vboxNetFltFreeBSDSGMBufFromSG(pThis, pSG);
+         if (m == NULL)
++        {
++            IPRT_FREEBSD_RESTORE_EFL_AC();
+             return VERR_NO_MEMORY;
++        }
+         m = m_pullup(m, ETHER_HDR_LEN);
+         if (m == NULL)
++        {
++            IPRT_FREEBSD_RESTORE_EFL_AC();
+             return VERR_NO_MEMORY;
++        }
+         /*
+          * Delivering packets to the host will be captured by the
+          * input hook. Tag the packet with a mbuf tag so that we
+@@ -556,6 +630,7 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
+         if (mtag == NULL)
+         {
+             m_freem(m);
++            IPRT_FREEBSD_RESTORE_EFL_AC();
+             return VERR_NO_MEMORY;
+         }
+ 
+@@ -566,6 +641,7 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
+         ifp->if_input(ifp, m);
+     }
+     VBOXCURVNET_RESTORE();
++    IPRT_FREEBSD_RESTORE_EFL_AC();
+     return VINF_SUCCESS;
+ }
+ 
+@@ -578,6 +654,7 @@ static bool vboxNetFltFreeBsdIsPromiscuous(PVBOXNETFLT
+ 
+ int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, void *pvContext)
+ {
++    IPRT_FREEBSD_SAVE_EFL_AC();
+     char nam[NG_NODESIZ];
+     struct ifnet *ifp;
+     node_p node;
+@@ -586,7 +663,10 @@ int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, voi
+     NOREF(pvContext);
+     ifp = ifunit(pThis->szName);
+     if (ifp == NULL)
++    {
++        IPRT_FREEBSD_RESTORE_EFL_AC();
+         return VERR_INTNET_FLT_IF_NOT_FOUND;
++    }
+ 
+     /* Create a new netgraph node for this instance */
+     if (ng_make_node_common(&ng_vboxnetflt_typestruct, &node) != 0)
+@@ -630,12 +710,14 @@ int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, voi
+         vboxNetFltRelease(pThis, true /*fBusy*/);
+     }
+     VBOXCURVNET_RESTORE();
++    IPRT_FREEBSD_RESTORE_EFL_AC();
+ 
+     return VINF_SUCCESS;
+ }
+ 
+ bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThis)
+ {
++    IPRT_FREEBSD_SAVE_EFL_AC();
+     struct ifnet *ifp, *ifp0;
+ 
+     ifp = ASMAtomicUoReadPtrT(&pThis->u.s.ifp, struct ifnet *);
+@@ -652,6 +734,7 @@ bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThi
+         pThis->u.s.node = NULL;
+     }
+     VBOXCURVNET_RESTORE();
++    IPRT_FREEBSD_RESTORE_EFL_AC();
+ 
+     if (ifp0 != NULL)
+     {
+@@ -664,6 +747,7 @@ bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThi
+ 
+ void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
+ {
++    IPRT_FREEBSD_SAVE_EFL_AC();
+ 
+     taskqueue_drain(taskqueue_fast, &pThis->u.s.tskin);
+     taskqueue_drain(taskqueue_fast, &pThis->u.s.tskout);
+@@ -676,6 +760,7 @@ void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
+         ng_rmnode_self(pThis->u.s.node);
+     VBOXCURVNET_RESTORE();
+     pThis->u.s.node = NULL;
++    IPRT_FREEBSD_RESTORE_EFL_AC();
+ }
+ 
+ int vboxNetFltOsPreInitInstance(PVBOXNETFLTINS pThis)
+@@ -689,6 +774,7 @@ int vboxNetFltOsPreInitInstance(PVBOXNETFLTINS pThis)
+ 
+ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, bool fActive)
+ {
++    IPRT_FREEBSD_SAVE_EFL_AC();
+     struct ifnet *ifp;
+     struct ifreq ifreq;
+     int error;
+@@ -722,7 +808,10 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
+         NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_CONNECT,
+             sizeof(struct ngm_connect), M_NOWAIT);
+         if (msg == NULL)
++        {
++            IPRT_FREEBSD_RESTORE_EFL_AC();
+             return;
++        }
+         con = (struct ngm_connect *)msg->data;
+         snprintf(con->path, NG_PATHSIZ, "vboxnetflt_%s:", ifp->if_xname);
+         strlcpy(con->ourhook, "lower", NG_HOOKSIZ);
+@@ -736,7 +825,10 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
+         NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_CONNECT,
+             sizeof(struct ngm_connect), M_NOWAIT);
+         if (msg == NULL)
++        {
++            IPRT_FREEBSD_RESTORE_EFL_AC();
+             return;
++        }
+         con = (struct ngm_connect *)msg->data;
+         snprintf(con->path, NG_PATHSIZ, "vboxnetflt_%s:",
+             ifp->if_xname);
+@@ -759,7 +851,10 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
+         NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_RMHOOK,
+             sizeof(struct ngm_rmhook), M_NOWAIT);
+         if (msg == NULL)
++        {
++            IPRT_FREEBSD_RESTORE_EFL_AC();
+             return;
++        }
+         rm = (struct ngm_rmhook *)msg->data;
+         strlcpy(rm->ourhook, "input", NG_HOOKSIZ);
+         NG_SEND_MSG_PATH(error, node, msg, path, 0);
+@@ -770,12 +865,16 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
+         NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_RMHOOK,
+             sizeof(struct ngm_rmhook), M_NOWAIT);
+         if (msg == NULL)
++        {
++            IPRT_FREEBSD_RESTORE_EFL_AC();
+             return;
++        }
+         rm = (struct ngm_rmhook *)msg->data;
+         strlcpy(rm->ourhook, "output", NG_HOOKSIZ);
+         NG_SEND_MSG_PATH(error, node, msg, path, 0);
+     }
+     VBOXCURVNET_RESTORE();
++    IPRT_FREEBSD_RESTORE_EFL_AC();
+ }
+ 
+ int vboxNetFltOsDisconnectIt(PVBOXNETFLTINS pThis)