Index: /trunk/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c	(revision 17184)
+++ /trunk/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c	(revision 17185)
@@ -39,12 +39,12 @@
 #include <VBox/log.h>
 #include <VBox/err.h>
-#include <VBox/version.h>
 #include <iprt/assert.h>
 #include <iprt/string.h>
 #include <iprt/spinlock.h>
 #include <iprt/uuid.h>
+#include <VBox/version.h>
 
 /** r=bird: why is this here in the agnositc code? */
-#ifndef RT_OS_SOLARIS
+#ifdef RT_OS_DARWIN
 # include <net/ethernet.h>
 # include <net/if_ether.h>
@@ -65,29 +65,4 @@
 
 
-
-/**
- * Generate a suitable MAC address.
- *
- * @param   pThis       The instance.
- * @param   pMac        Where to return the MAC address.
- */
-DECLHIDDEN(void) vboxNetAdpComposeMACAddress(PVBOXNETADP pThis, PRTMAC pMac)
-{
-#if 0 /* Use a locally administered version of the OUI we use for the guest NICs. */
-    pMac->au8[0] = 0x08 | 2;
-    pMac->au8[1] = 0x00;
-    pMac->au8[2] = 0x27;
-#else /* this is what \0vb comes down to. It seems to be unassigned atm. */
-    pMac->au8[0] = 0;
-    pMac->au8[1] = 0x76;
-    pMac->au8[2] = 0x62;
-#endif
-
-    pMac->au8[3] = pThis->uUnit >> 16;
-    pMac->au8[4] = pThis->uUnit >> 8;
-    pMac->au8[5] = pThis->uUnit;
-}
-
-
 AssertCompileMemberSize(VBOXNETADP, enmState, sizeof(uint32_t));
 
@@ -122,5 +97,5 @@
 
 /**
- * Sets the enmState member atomically.
+ * Sets the enmState member atomically after first acquiring the spinlock.
  *
  * Used for all updates.
@@ -131,7 +106,6 @@
 DECLINLINE(void) vboxNetAdpSetStateWithLock(PVBOXNETADP pThis, VBOXNETADPSTATE enmNewState)
 {
-    VBOXNETADPSTATE enmState;
     RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
-    Log(("vboxNetAdpSetStateWithLock: pThis=%p, state=%d.\n", pThis, enmState));
+    Log(("vboxNetAdpSetStateWithLock: pThis=%p, state=%d.\n", pThis, enmNewState));
     RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
     vboxNetAdpSetState(pThis, enmNewState);
@@ -193,5 +167,4 @@
 /**
  * Finds a instance by its name, the caller does the locking.
- *
  *
  * @returns Pointer to the instance by the given name. NULL if not found.
@@ -333,4 +306,28 @@
 
     NOREF(cBusy);
+}
+
+
+/**
+ * Generate a suitable MAC address.
+ *
+ * @param   pThis       The instance.
+ * @param   pMac        Where to return the MAC address.
+ */
+DECLHIDDEN(void) vboxNetAdpComposeMACAddress(PVBOXNETADP pThis, PRTMAC pMac)
+{
+#if 0 /* Use a locally administered version of the OUI we use for the guest NICs. */
+    pMac->au8[0] = 0x08 | 2;
+    pMac->au8[1] = 0x00;
+    pMac->au8[2] = 0x27;
+#else /* this is what \0vb comes down to. It seems to be unassigned atm. */
+    pMac->au8[0] = 0;
+    pMac->au8[1] = 0x76;
+    pMac->au8[2] = 0x62;
+#endif
+
+    pMac->au8[3] = 0; /* pThis->uUnit >> 16; */
+    pMac->au8[4] = 0; /* pThis->uUnit >> 8; */
+    pMac->au8[5] = pThis->uUnit;
 }
 
@@ -847,7 +844,6 @@
 DECLHIDDEN(bool) vboxNetAdpCanUnload(PVBOXNETADPGLOBALS pGlobals)
 {
-    int rc;
+    bool fRc = true; /* Assume it can be unloaded. */
     unsigned i;
-    bool fRc = true; /* Assume it can be unloaded. */
 
     for (i = 0; i < RT_ELEMENTS(pGlobals->aAdapters); i++)
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c	(revision 17184)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c	(revision 17185)
@@ -222,10 +222,11 @@
 #include <VBox/err.h>
 #include <iprt/assert.h>
-#include <iprt/mem.h>
 #include <iprt/string.h>
 #include <iprt/spinlock.h>
+#include <iprt/uuid.h>
+#include <iprt/mem.h>
+#include <iprt/time.h>
 #include <iprt/semaphore.h>
-#include <iprt/time.h>
-#include <iprt/uuid.h>
+
 
 /*******************************************************************************