Index: unk/include/VBox/VBoxNetSend.h
===================================================================
--- /trunk/include/VBox/VBoxNetSend.h	(revision 50409)
+++ 	(revision )
@@ -1,107 +1,0 @@
-/* $Id$ */
-/** @file
- * A place to share code and definitions between VBoxNetAdp and VBoxNetFlt host drivers.
- */
-
-/*
- * Copyright (C) 2014 Oracle Corporation
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- *
- * The contents of this file may alternatively be used under the terms
- * of the Common Development and Distribution License Version 1.0
- * (CDDL) only, as it comes in the "COPYING.CDDL" file of the
- * VirtualBox OSE distribution, in which case the provisions of the
- * CDDL are applicable instead of those of the GPL.
- *
- * You may elect to license modified versions of this file under the
- * terms and conditions of either the GPL or the CDDL or both.
- */
-
-/** @todo move this to src/VBox/HostDrivers/darwin as a .cpp file. */
-#ifndef ___VBox_VBoxNetSend_h
-#define ___VBox_VBoxNetSend_h
-
-#if defined(RT_OS_DARWIN)
-
-# include <iprt/err.h>
-# include <iprt/assert.h>
-# include <iprt/string.h>
-
-# include <sys/socket.h>
-# include <net/kpi_interface.h>
-RT_C_DECLS_BEGIN /* Buggy 10.4 headers, fixed in 10.5. */
-# include <sys/kpi_mbuf.h>
-RT_C_DECLS_END
-# include <net/if.h>
-
-RT_C_DECLS_BEGIN
-
-# if defined(IN_RING0)
-
-/**
- * Constructs and submits a dummy packet to ifnet_input().
- *
- * This is a workaround for "stuck dock icon" issue. When the first packet goes
- * through the interface DLIL grabs a reference to the thread that submits the
- * packet and holds it until the interface is destroyed. By submitting this
- * dummy we make DLIL grab the thread of a non-GUI process.
- *
- * Most of this function was copied from vboxNetFltDarwinMBufFromSG().
- *
- * @returns VBox status code.
- * @param   pIfNet      The interface that will hold the reference to the calling
- *                      thread. We submit dummy as if it was coming from this interface.
- */
-DECLINLINE(int) VBoxNetSendDummy(ifnet_t pIfNet)
-{
-    int rc = VINF_SUCCESS;
-
-    size_t      cbTotal = 50; /* No Ethernet header */
-    mbuf_how_t  How     = MBUF_WAITOK;
-    mbuf_t      pPkt    = NULL;
-    errno_t err = mbuf_allocpacket(How, cbTotal, NULL, &pPkt);
-    if (!err)
-    {
-        /* Skip zero sized memory buffers (paranoia). */
-        mbuf_t pCur = pPkt;
-        while (pCur && !mbuf_maxlen(pCur))
-            pCur = mbuf_next(pCur);
-        Assert(pCur);
-
-        /* Set the required packet header attributes. */
-        mbuf_pkthdr_setlen(pPkt, cbTotal);
-        mbuf_pkthdr_setheader(pPkt, mbuf_data(pCur));
-
-        mbuf_setlen(pCur, cbTotal);
-        memset(mbuf_data(pCur), 0, cbTotal);
-
-        mbuf_pkthdr_setrcvif(pPkt, pIfNet); /* will crash without this. */
-
-        errno_t err = ifnet_input(pIfNet, pPkt, NULL);
-        if (err)
-        {
-            rc = RTErrConvertFromErrno(err);
-            mbuf_freem(pPkt);
-        }
-    }
-    else
-        rc = RTErrConvertFromErrno(err);
-
-    return rc;
-}
-
-# endif /* IN_RING0 */
-
-RT_C_DECLS_END
-
-#endif /* RT_OS_DARWIN */
-
-#endif /* !___VBox_VBoxNetSend_h */
-
Index: /trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp	(revision 50409)
+++ /trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp	(revision 50410)
@@ -32,5 +32,4 @@
 #include <VBox/err.h>
 #include <VBox/version.h>
-#include <VBox/VBoxNetSend.h>
 #include <iprt/assert.h>
 #include <iprt/initterm.h>
@@ -40,4 +39,6 @@
 #include <iprt/uuid.h>
 #include <iprt/alloca.h>
+
+#include "../../darwin/VBoxNetSend.h"
 
 #include <sys/systm.h>
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp	(revision 50409)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp	(revision 50410)
@@ -35,5 +35,4 @@
 #include <VBox/intnetinline.h>
 #include <VBox/version.h>
-#include <VBox/VBoxNetSend.h>
 #include <iprt/initterm.h>
 #include <iprt/assert.h>
@@ -46,4 +45,6 @@
 #include <iprt/net.h>
 #include <iprt/thread.h>
+
+#include "../../darwin/VBoxNetSend.h"
 
 #include <mach/kmod.h>
Index: /trunk/src/VBox/HostDrivers/darwin/VBoxNetSend.h
===================================================================
--- /trunk/src/VBox/HostDrivers/darwin/VBoxNetSend.h	(revision 50410)
+++ /trunk/src/VBox/HostDrivers/darwin/VBoxNetSend.h	(revision 50410)
@@ -0,0 +1,107 @@
+/* $Id$ */
+/** @file
+ * A place to share code and definitions between VBoxNetAdp and VBoxNetFlt host drivers.
+ */
+
+/*
+ * Copyright (C) 2014 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ *
+ * The contents of this file may alternatively be used under the terms
+ * of the Common Development and Distribution License Version 1.0
+ * (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+ * VirtualBox OSE distribution, in which case the provisions of the
+ * CDDL are applicable instead of those of the GPL.
+ *
+ * You may elect to license modified versions of this file under the
+ * terms and conditions of either the GPL or the CDDL or both.
+ */
+
+/** @todo move this to src/VBox/HostDrivers/darwin as a .cpp file. */
+#ifndef ___VBox_VBoxNetSend_h
+#define ___VBox_VBoxNetSend_h
+
+#if defined(RT_OS_DARWIN)
+
+# include <iprt/err.h>
+# include <iprt/assert.h>
+# include <iprt/string.h>
+
+# include <sys/socket.h>
+# include <net/kpi_interface.h>
+RT_C_DECLS_BEGIN /* Buggy 10.4 headers, fixed in 10.5. */
+# include <sys/kpi_mbuf.h>
+RT_C_DECLS_END
+# include <net/if.h>
+
+RT_C_DECLS_BEGIN
+
+# if defined(IN_RING0)
+
+/**
+ * Constructs and submits a dummy packet to ifnet_input().
+ *
+ * This is a workaround for "stuck dock icon" issue. When the first packet goes
+ * through the interface DLIL grabs a reference to the thread that submits the
+ * packet and holds it until the interface is destroyed. By submitting this
+ * dummy we make DLIL grab the thread of a non-GUI process.
+ *
+ * Most of this function was copied from vboxNetFltDarwinMBufFromSG().
+ *
+ * @returns VBox status code.
+ * @param   pIfNet      The interface that will hold the reference to the calling
+ *                      thread. We submit dummy as if it was coming from this interface.
+ */
+DECLINLINE(int) VBoxNetSendDummy(ifnet_t pIfNet)
+{
+    int rc = VINF_SUCCESS;
+
+    size_t      cbTotal = 50; /* No Ethernet header */
+    mbuf_how_t  How     = MBUF_WAITOK;
+    mbuf_t      pPkt    = NULL;
+    errno_t err = mbuf_allocpacket(How, cbTotal, NULL, &pPkt);
+    if (!err)
+    {
+        /* Skip zero sized memory buffers (paranoia). */
+        mbuf_t pCur = pPkt;
+        while (pCur && !mbuf_maxlen(pCur))
+            pCur = mbuf_next(pCur);
+        Assert(pCur);
+
+        /* Set the required packet header attributes. */
+        mbuf_pkthdr_setlen(pPkt, cbTotal);
+        mbuf_pkthdr_setheader(pPkt, mbuf_data(pCur));
+
+        mbuf_setlen(pCur, cbTotal);
+        memset(mbuf_data(pCur), 0, cbTotal);
+
+        mbuf_pkthdr_setrcvif(pPkt, pIfNet); /* will crash without this. */
+
+        errno_t err = ifnet_input(pIfNet, pPkt, NULL);
+        if (err)
+        {
+            rc = RTErrConvertFromErrno(err);
+            mbuf_freem(pPkt);
+        }
+    }
+    else
+        rc = RTErrConvertFromErrno(err);
+
+    return rc;
+}
+
+# endif /* IN_RING0 */
+
+RT_C_DECLS_END
+
+#endif /* RT_OS_DARWIN */
+
+#endif /* !___VBox_VBoxNetSend_h */
+
