Index: trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf-win.cpp
===================================================================
--- trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf-win.cpp	(revision 56205)
+++ trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf-win.cpp	(revision 56229)
@@ -409,9 +409,9 @@
         fSuccess = ASMAtomicCmpXchgU32(&pModuleCtx->enmState, enmNew, enmOld);
         if (fSuccess)
-            Log((__FUNCTION__": state change %s -> %s\n",
+            Log(("vboxNetLwfWinChangeState: state change %s -> %s\n",
                  vboxNetLwfWinStateToText(enmOld),
                  vboxNetLwfWinStateToText(enmNew)));
         else
-            Log((__FUNCTION__": failed state change %s (actual=%s) -> %s\n",
+            Log(("ERROR! vboxNetLwfWinChangeState: failed state change %s (actual=%s) -> %s\n",
                  vboxNetLwfWinStateToText(enmOld),
                  vboxNetLwfWinStateToText(ASMAtomicReadU32(&pModuleCtx->enmState)),
@@ -422,5 +422,5 @@
     {
         uint32_t enmPrevState = ASMAtomicXchgU32(&pModuleCtx->enmState, enmNew);
-        Log((__FUNCTION__": state change %s -> %s\n",
+        Log(("vboxNetLwfWinChangeState: state change %s -> %s\n",
              vboxNetLwfWinStateToText(enmPrevState),
              vboxNetLwfWinStateToText(enmNew)));
@@ -484,5 +484,5 @@
                                     IN PNDIS_OID_REQUEST pOidRequest)
 {
-    LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
+    LogFlow(("==>vboxNetLwfWinOidRequest: module=%p\n", hModuleCtx));
     vboxNetCmnWinDumpOidRequest(__FUNCTION__, pOidRequest);
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)hModuleCtx;
@@ -506,10 +506,10 @@
         {
             ASMAtomicWriteBool(&pModuleCtx->fHostPromisc, !!(*(ULONG*)pOidRequest->DATA.SET_INFORMATION.InformationBuffer & NDIS_PACKET_TYPE_PROMISCUOUS));
-            Log((__FUNCTION__": host wanted to set packet filter value to:\n"));
+            Log(("vboxNetLwfWinOidRequest: host wanted to set packet filter value to:\n"));
             vboxNetLwfWinDumpFilterTypes(*(ULONG*)pOidRequest->DATA.SET_INFORMATION.InformationBuffer);
             /* Keep adapter in promisc mode as long as we are active. */
             if (ASMAtomicReadBool(&pModuleCtx->fActive))
                 *(ULONG*)pClone->DATA.SET_INFORMATION.InformationBuffer |= NDIS_PACKET_TYPE_PROMISCUOUS;
-            Log5((__FUNCTION__": pass the following packet filters to miniport:\n"));
+            Log5(("vboxNetLwfWinOidRequest: pass the following packet filters to miniport:\n"));
             vboxNetLwfWinDumpFilterTypes(*(ULONG*)pOidRequest->DATA.SET_INFORMATION.InformationBuffer);
         }
@@ -517,5 +517,5 @@
             && pOidRequest->DATA.SET_INFORMATION.Oid == OID_TCP_OFFLOAD_CURRENT_CONFIG)
         {
-            Log5((__FUNCTION__": offloading set to:\n"));
+            Log5(("vboxNetLwfWinOidRequest: offloading set to:\n"));
             vboxNetLwfWinDumpSetOffloadSettings((PNDIS_OFFLOAD)pOidRequest->DATA.SET_INFORMATION.InformationBuffer);
         }
@@ -528,5 +528,5 @@
             pPrev = ASMAtomicXchgPtrT(&pModuleCtx->pPendingRequest, NULL, PNDIS_OID_REQUEST);
             Assert(pPrev == pClone);
-            Log5((__FUNCTION__": got the following packet filters from miniport:\n"));
+            Log5(("vboxNetLwfWinOidRequest: got the following packet filters from miniport:\n"));
             vboxNetLwfWinDumpFilterTypes(*(ULONG*)pOidRequest->DATA.QUERY_INFORMATION.InformationBuffer);
             /*
@@ -537,5 +537,5 @@
                 && pOidRequest->DATA.QUERY_INFORMATION.Oid == OID_GEN_CURRENT_PACKET_FILTER)
                 vboxNetLwfWinOverridePacketFiltersUp(pModuleCtx, (ULONG*)pOidRequest->DATA.QUERY_INFORMATION.InformationBuffer);
-            Log5((__FUNCTION__": reporting to the host the following packet filters:\n"));
+            Log5(("vboxNetLwfWinOidRequest: reporting to the host the following packet filters:\n"));
             vboxNetLwfWinDumpFilterTypes(*(ULONG*)pOidRequest->DATA.QUERY_INFORMATION.InformationBuffer);
             vboxNetLwfWinCopyOidRequestResults(pClone, pOidRequest);
@@ -546,7 +546,7 @@
     else
     {
-        Log((__FUNCTION__": NdisAllocateCloneOidRequest failed with 0x%x\n", Status));
-    }
-    LogFlow(("<=="__FUNCTION__": Status=0x%x\n", Status));
+        Log(("ERROR! vboxNetLwfWinOidRequest: NdisAllocateCloneOidRequest failed with 0x%x\n", Status));
+    }
+    LogFlow(("<==vboxNetLwfWinOidRequest: Status=0x%x\n", Status));
     return Status;
 }
@@ -556,5 +556,5 @@
                                      IN NDIS_STATUS Status)
 {
-    LogFlow(("==>"__FUNCTION__": module=%p req=%p status=0x%x\n", hModuleCtx, pRequest, Status));
+    LogFlow(("==>vboxNetLwfWinOidRequestComplete: module=%p req=%p status=0x%x\n", hModuleCtx, pRequest, Status));
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)hModuleCtx;
     PNDIS_OID_REQUEST pOriginal = *((PNDIS_OID_REQUEST*)(pRequest->SourceReserved));
@@ -565,13 +565,13 @@
         Assert(pPrev == pRequest);
 
-        Log5((__FUNCTION__": completed rq type=%d oid=%x\n", pRequest->RequestType, pRequest->DATA.QUERY_INFORMATION.Oid));
+        Log5(("vboxNetLwfWinOidRequestComplete: completed rq type=%d oid=%x\n", pRequest->RequestType, pRequest->DATA.QUERY_INFORMATION.Oid));
         vboxNetLwfWinCopyOidRequestResults(pRequest, pOriginal);
         if (   pRequest->RequestType == NdisRequestQueryInformation
             && pRequest->DATA.QUERY_INFORMATION.Oid == OID_GEN_CURRENT_PACKET_FILTER)
         {
-            Log5((__FUNCTION__": underlying miniport reports its packet filters:\n"));
+            Log5(("vboxNetLwfWinOidRequestComplete: underlying miniport reports its packet filters:\n"));
             vboxNetLwfWinDumpFilterTypes(*(ULONG*)pRequest->DATA.QUERY_INFORMATION.InformationBuffer);
             vboxNetLwfWinOverridePacketFiltersUp(pModuleCtx, (ULONG*)pRequest->DATA.QUERY_INFORMATION.InformationBuffer);
-            Log5((__FUNCTION__": reporting the following packet filters to upper protocol:\n"));
+            Log5(("vboxNetLwfWinOidRequestComplete: reporting the following packet filters to upper protocol:\n"));
             vboxNetLwfWinDumpFilterTypes(*(ULONG*)pRequest->DATA.QUERY_INFORMATION.InformationBuffer);
         }
@@ -582,10 +582,10 @@
     {
         /* This is not a clone, we originated it */
-        Log((__FUNCTION__": locally originated request (%p) completed, status=0x%x\n", pRequest, Status));
+        Log(("vboxNetLwfWinOidRequestComplete: locally originated request (%p) completed, status=0x%x\n", pRequest, Status));
         PVBOXNETLWF_OIDREQ pRqWrapper = RT_FROM_MEMBER(pRequest, VBOXNETLWF_OIDREQ, Request);
         pRqWrapper->Status = Status;
         NdisSetEvent(&pRqWrapper->Event);
     }
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetLwfWinOidRequestComplete\n"));
 }
 
@@ -599,5 +599,5 @@
 static NDIS_STATUS vboxNetLwfWinGetPacketFilter(PVBOXNETLWF_MODULE pModuleCtx)
 {
-    LogFlow(("==>"__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetLwfWinGetPacketFilter: module=%p\n", pModuleCtx));
     VBOXNETLWF_OIDREQ Rq;
     vboxNetLwfWinInitOidRequest(&Rq);
@@ -609,16 +609,16 @@
     if (Status != NDIS_STATUS_SUCCESS)
     {
-        Log((__FUNCTION__": vboxNetLwfWinSyncOidRequest(query, OID_GEN_CURRENT_PACKET_FILTER) failed with 0x%x\n", Status));
+        Log(("ERROR! vboxNetLwfWinGetPacketFilter: vboxNetLwfWinSyncOidRequest(query, OID_GEN_CURRENT_PACKET_FILTER) failed with 0x%x\n", Status));
         return FALSE;
     }
     if (Rq.Request.DATA.QUERY_INFORMATION.BytesWritten != sizeof(pModuleCtx->uPacketFilter))
     {
-        Log((__FUNCTION__": vboxNetLwfWinSyncOidRequest(query, OID_GEN_CURRENT_PACKET_FILTER) failed to write neccessary amount (%d bytes), actually written %d bytes\n", sizeof(pModuleCtx->uPacketFilter), Rq.Request.DATA.QUERY_INFORMATION.BytesWritten));
-    }
-
-    Log5((__FUNCTION__": OID_GEN_CURRENT_PACKET_FILTER query returned the following filters:\n"));
+        Log(("ERROR! vboxNetLwfWinGetPacketFilter: vboxNetLwfWinSyncOidRequest(query, OID_GEN_CURRENT_PACKET_FILTER) failed to write neccessary amount (%d bytes), actually written %d bytes\n", sizeof(pModuleCtx->uPacketFilter), Rq.Request.DATA.QUERY_INFORMATION.BytesWritten));
+    }
+
+    Log5(("vboxNetLwfWinGetPacketFilter: OID_GEN_CURRENT_PACKET_FILTER query returned the following filters:\n"));
     vboxNetLwfWinDumpFilterTypes(pModuleCtx->uPacketFilter);
 
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("<==vboxNetLwfWinGetPacketFilter: status=0x%x\n", Status));
     return Status;
 }
@@ -627,5 +627,5 @@
 static NDIS_STATUS vboxNetLwfWinSetPacketFilter(PVBOXNETLWF_MODULE pModuleCtx, bool fPromisc)
 {
-    LogFlow(("==>"__FUNCTION__": module=%p %s\n", pModuleCtx, fPromisc ? "promiscuous" : "normal"));
+    LogFlow(("==>vboxNetLwfWinSetPacketFilter: module=%p %s\n", pModuleCtx, fPromisc ? "promiscuous" : "normal"));
     ULONG uFilter = 0;
     VBOXNETLWF_OIDREQ Rq;
@@ -638,14 +638,14 @@
     if (Status != NDIS_STATUS_SUCCESS)
     {
-        Log((__FUNCTION__": vboxNetLwfWinSyncOidRequest(query, OID_GEN_CURRENT_PACKET_FILTER) failed with 0x%x\n", Status));
+        Log(("ERROR! vboxNetLwfWinSetPacketFilter: vboxNetLwfWinSyncOidRequest(query, OID_GEN_CURRENT_PACKET_FILTER) failed with 0x%x\n", Status));
         return Status;
     }
     if (Rq.Request.DATA.QUERY_INFORMATION.BytesWritten != sizeof(uFilter))
     {
-        Log((__FUNCTION__": vboxNetLwfWinSyncOidRequest(query, OID_GEN_CURRENT_PACKET_FILTER) failed to write neccessary amount (%d bytes), actually written %d bytes\n", sizeof(uFilter), Rq.Request.DATA.QUERY_INFORMATION.BytesWritten));
+        Log(("ERROR! vboxNetLwfWinSetPacketFilter: vboxNetLwfWinSyncOidRequest(query, OID_GEN_CURRENT_PACKET_FILTER) failed to write neccessary amount (%d bytes), actually written %d bytes\n", sizeof(uFilter), Rq.Request.DATA.QUERY_INFORMATION.BytesWritten));
         return NDIS_STATUS_FAILURE;
     }
 
-    Log5((__FUNCTION__": OID_GEN_CURRENT_PACKET_FILTER query returned the following filters:\n"));
+    Log5(("vboxNetLwfWinSetPacketFilter: OID_GEN_CURRENT_PACKET_FILTER query returned the following filters:\n"));
     vboxNetLwfWinDumpFilterTypes(uFilter);
 
@@ -663,5 +663,5 @@
     }
 
-    Log5((__FUNCTION__": OID_GEN_CURRENT_PACKET_FILTER about to set the following filters:\n"));
+    Log5(("vboxNetLwfWinSetPacketFilter: OID_GEN_CURRENT_PACKET_FILTER about to set the following filters:\n"));
     vboxNetLwfWinDumpFilterTypes(uFilter);
 
@@ -674,8 +674,8 @@
     if (Status != NDIS_STATUS_SUCCESS)
     {
-        Log((__FUNCTION__": vboxNetLwfWinSyncOidRequest(set, OID_GEN_CURRENT_PACKET_FILTER, vvv below vvv) failed with 0x%x\n", Status));
+        Log(("ERROR! vboxNetLwfWinSetPacketFilter: vboxNetLwfWinSyncOidRequest(set, OID_GEN_CURRENT_PACKET_FILTER, vvv below vvv) failed with 0x%x\n", Status));
         vboxNetLwfWinDumpFilterTypes(uFilter);
     }
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("<==vboxNetLwfWinSetPacketFilter: status=0x%x\n", Status));
     return Status;
 }
@@ -764,5 +764,5 @@
                                        IN PNDIS_FILTER_ATTACH_PARAMETERS pParameters)
 {
-    LogFlow(("==>"__FUNCTION__": filter=%p\n", hFilter));
+    LogFlow(("==>vboxNetLwfWinAttach: filter=%p\n", hFilter));
 
     PVBOXNETLWFGLOBALS pGlobals = (PVBOXNETLWFGLOBALS)hDriverCtx;
@@ -775,5 +775,5 @@
     if (!pModuleCtx)
         return NDIS_STATUS_RESOURCES;
-    Log4((__FUNCTION__ ": allocated module context 0x%p\n", pModuleCtx));
+    Log4(("vboxNetLwfWinAttach: allocated module context 0x%p\n", pModuleCtx));
 
     NdisZeroMemory(pModuleCtx, sizeof(VBOXNETLWF_MODULE));
@@ -831,10 +831,10 @@
     if (!pModuleCtx->hPool)
     {
-        Log(("ERROR! "__FUNCTION__": NdisAllocateNetBufferListPool failed\n"));
+        Log(("ERROR! vboxNetLwfWinAttach: NdisAllocateNetBufferListPool failed\n"));
         RtlFreeAnsiString(&pModuleCtx->strMiniportName);
         NdisFreeMemory(pModuleCtx, 0, 0);
         return NDIS_STATUS_RESOURCES;
     }
-    Log4((__FUNCTION__ ": allocated NBL+NB pool 0x%p\n", pModuleCtx->hPool));
+    Log4(("vboxNetLwfWinAttach: allocated NBL+NB pool 0x%p\n", pModuleCtx->hPool));
 
     NDIS_FILTER_ATTRIBUTES Attributes;
@@ -849,5 +849,5 @@
         Log(("ERROR! vboxNetLwfWinAttach: NdisFSetAttributes failed with 0x%x\n", Status));
         NdisFreeNetBufferListPool(pModuleCtx->hPool);
-        Log4((__FUNCTION__ ": freed NBL+NB pool 0x%p\n", pModuleCtx->hPool));
+        Log4(("vboxNetLwfWinAttach: freed NBL+NB pool 0x%p\n", pModuleCtx->hPool));
         RtlFreeAnsiString(&pModuleCtx->strMiniportName);
         NdisFreeMemory(pModuleCtx, 0, 0);
@@ -860,5 +860,5 @@
     /// @todo We actually update it later in status handler, perhaps we should not do anything here.
 
-    LogFlow(("<=="__FUNCTION__": Status = 0x%x\n", Status));
+    LogFlow(("<==vboxNetLwfWinAttach: Status = 0x%x\n", Status));
     return Status;
 }
@@ -866,5 +866,5 @@
 static VOID vboxNetLwfWinDetach(IN NDIS_HANDLE hModuleCtx)
 {
-    LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
+    LogFlow(("==>vboxNetLwfWinDetach: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)hModuleCtx;
     vboxNetLwfWinChangeState(pModuleCtx, LwfState_Detached, LwfState_Paused);
@@ -897,10 +897,10 @@
     {
         NdisFreeNetBufferListPool(pModuleCtx->hPool);
-        Log4((__FUNCTION__ ": freed NBL+NB pool 0x%p\n", pModuleCtx->hPool));
+        Log4(("vboxNetLwfWinDetach: freed NBL+NB pool 0x%p\n", pModuleCtx->hPool));
     }
     RtlFreeAnsiString(&pModuleCtx->strMiniportName);
     NdisFreeMemory(hModuleCtx, 0, 0);
-    Log4((__FUNCTION__ ": freed module context 0x%p\n", pModuleCtx));
-    LogFlow(("<=="__FUNCTION__"\n"));
+    Log4(("vboxNetLwfWinDetach: freed module context 0x%p\n", pModuleCtx));
+    LogFlow(("<==vboxNetLwfWinDetach\n"));
 }
 
@@ -908,5 +908,5 @@
 static NDIS_STATUS vboxNetLwfWinPause(IN NDIS_HANDLE hModuleCtx, IN PNDIS_FILTER_PAUSE_PARAMETERS pParameters)
 {
-    LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
+    LogFlow(("==>vboxNetLwfWinPause: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)hModuleCtx;
     vboxNetLwfWinChangeState(pModuleCtx, LwfState_Pausing, LwfState_Running);
@@ -918,5 +918,5 @@
     vboxNetLwfWinChangeState(pModuleCtx, LwfState_Paused, LwfState_Pausing);
     NDIS_RELEASE_MUTEX(&pModuleCtx->InTransmit);
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetLwfWinPause\n"));
     return NDIS_STATUS_SUCCESS; /* Failure is not an option */
 }
@@ -925,5 +925,5 @@
 static void vboxNetLwfWinIndicateOffload(PVBOXNETLWF_MODULE pModuleCtx, PNDIS_OFFLOAD pOffload)
 {
-    Log5((__FUNCTION__": offload config changed to:\n"));
+    Log5(("vboxNetLwfWinIndicateOffload: offload config changed to:\n"));
     vboxNetLwfWinDumpOffloadSettings(pOffload);
     NDIS_STATUS_INDICATION OffloadingIndication;
@@ -942,5 +942,5 @@
 static NDIS_STATUS vboxNetLwfWinRestart(IN NDIS_HANDLE hModuleCtx, IN PNDIS_FILTER_RESTART_PARAMETERS pParameters)
 {
-    LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
+    LogFlow(("==>vboxNetLwfWinRestart: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)hModuleCtx;
     vboxNetLwfWinChangeState(pModuleCtx, LwfState_Restarting, LwfState_Paused);
@@ -984,5 +984,5 @@
             OffloadConfig.LsoV2.IPv6.TcpOptionsSupported                    = NDIS_OFFLOAD_NOT_SUPPORTED;
             vboxNetLwfWinIndicateOffload(pModuleCtx, &OffloadConfig);
-            Log((__FUNCTION__": set offloading off\n"));
+            Log(("vboxNetLwfWinRestart: set offloading off\n"));
         }
         else
@@ -990,5 +990,5 @@
             /* The filter is inactive -- restore offloading configuration. */
             vboxNetLwfWinIndicateOffload(pModuleCtx, &pModuleCtx->SavedOffloadConfig);
-            Log((__FUNCTION__": restored offloading config\n"));
+            Log(("vboxNetLwfWinRestart: restored offloading config\n"));
         }
     }
@@ -997,5 +997,5 @@
     vboxNetLwfWinChangeState(pModuleCtx, LwfState_Running, LwfState_Restarting);
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
-    LogFlow(("<=="__FUNCTION__": Status = 0x%x\n", Status));
+    LogFlow(("<==vboxNetLwfWinRestart: Status = 0x%x\n", Status));
     return Status;
 }
@@ -1161,5 +1161,5 @@
 {
     NdisFreeMemory(pSG, 0, 0);
-    Log4((__FUNCTION__ ": freed SG 0x%p\n", pSG));
+    Log4(("vboxNetLwfWinDestroySG: freed SG 0x%p\n", pSG));
 }
 
@@ -1180,5 +1180,5 @@
         pMdlNext = pMdl->Next;
         NdisFreeMdl(pMdl);
-        Log4((__FUNCTION__ ": freed MDL 0x%p\n", pMdl));
+        Log4(("vboxNetLwfWinFreeMdlChain: freed MDL 0x%p\n", pMdl));
         pMdl = pMdlNext;
     }
@@ -1194,5 +1194,5 @@
 {
     AssertReturn(pSG->cSegsUsed >= 1, NULL);
-    LogFlow(("==>"__FUNCTION__": segments=%d\n", pSG->cSegsUsed));
+    LogFlow(("==>vboxNetLwfWinSGtoNB: segments=%d\n", pSG->cSegsUsed));
 
 #ifdef VBOXNETLWF_SYNC_SEND
@@ -1201,9 +1201,9 @@
     if (!pMdl)
     {
-        Log(("ERROR! "__FUNCTION__": failed to allocate an MDL\n"));
-        LogFlow(("<=="__FUNCTION__": return NULL\n"));
+        Log(("ERROR! vboxNetLwfWinSGtoNB: failed to allocate an MDL\n"));
+        LogFlow(("<==vboxNetLwfWinSGtoNB: return NULL\n"));
         return NULL;
     }
-    Log4((__FUNCTION__ ": allocated Mdl 0x%p\n", pMdl));
+    Log4(("vboxNetLwfWinSGtoNB: allocated Mdl 0x%p\n", pMdl));
     PMDL pMdlCurr = pMdl;
     for (int i = 1; i < pSG->cSegsUsed; i++)
@@ -1213,5 +1213,5 @@
         if (!pMdlCurr->Next)
         {
-            Log(("ERROR! "__FUNCTION__": failed to allocate an MDL\n"));
+            Log(("ERROR! vboxNetLwfWinSGtoNB: failed to allocate an MDL\n"));
             /* Tear down all MDL we chained so far */
             vboxNetLwfWinFreeMdlChain(pMdl);
@@ -1219,5 +1219,5 @@
         }
         pMdlCurr = pMdlCurr->Next;
-        Log4((__FUNCTION__ ": allocated Mdl 0x%p\n", pMdlCurr));
+        Log4(("vboxNetLwfWinSGtoNB: allocated Mdl 0x%p\n", pMdlCurr));
     }
     PNET_BUFFER_LIST pBufList = NdisAllocateNetBufferAndNetBufferList(pModule->hPool,
@@ -1229,5 +1229,5 @@
     if (pBufList)
     {
-        Log4((__FUNCTION__ ": allocated NBL+NB 0x%p\n", pBufList));
+        Log4(("vboxNetLwfWinSGtoNB: allocated NBL+NB 0x%p\n", pBufList));
         pBufList->SourceHandle = pModule->hFilter;
         /** @todo Do we need to initialize anything else? */
@@ -1235,5 +1235,5 @@
     else
     {
-        Log(("ERROR! "__FUNCTION__": failed to allocate an NBL+NB\n"));
+        Log(("ERROR! vboxNetLwfWinSGtoNB: failed to allocate an NBL+NB\n"));
         vboxNetLwfWinFreeMdlChain(pMdl);
     }
@@ -1256,5 +1256,5 @@
                 pDst += pSG->aSegs[i].cb;
             }
-            Log4((__FUNCTION__ ": allocated NBL+NB+MDL+Data 0x%p\n", pBufList));
+            Log4(("vboxNetLwfWinSGtoNB: allocated NBL+NB+MDL+Data 0x%p\n", pBufList));
             pBufList->SourceHandle = pModule->hFilter;
             /** @todo Do we need to initialize anything else? */
@@ -1262,5 +1262,5 @@
         else
         {
-            Log((__FUNCTION__": failed to obtain the buffer pointer (size=%u)\n", pSG->cbTotal));
+            Log(("ERROR! vboxNetLwfWinSGtoNB: failed to obtain the buffer pointer (size=%u)\n", pSG->cbTotal));
             NdisAdvanceNetBufferDataStart(pBuffer, pSG->cbTotal, false, NULL); /** @todo why bother? */
             NdisFreeNetBufferList(pBufList);
@@ -1270,10 +1270,10 @@
     else
     {
-        Log((__FUNCTION__": NdisRetreatNetBufferDataStart failed with 0x%x (size=%u)\n", Status, pSG->cbTotal));
+        Log(("ERROR! vboxNetLwfWinSGtoNB: NdisRetreatNetBufferDataStart failed with 0x%x (size=%u)\n", Status, pSG->cbTotal));
         NdisFreeNetBufferList(pBufList);
         pBufList = NULL;
     }
 #endif /* !VBOXNETLWF_SYNC_SEND */
-    LogFlow(("<=="__FUNCTION__": return %p\n", pBufList));
+    LogFlow(("<==vboxNetLwfWinSGtoNB: return %p\n", pBufList));
     return pBufList;
 }
@@ -1289,5 +1289,5 @@
                                                                  NormalPoolPriority);
     AssertReturn(pSG, pSG);
-    Log4((__FUNCTION__ ": allocated SG 0x%p\n", pSG));
+    Log4(("vboxNetLwfWinNBtoSG: allocated SG 0x%p\n", pSG));
     IntNetSgInitTempSegs(pSG, cbPacket /*cbTotal*/, cSegs, cSegs /*cSegsUsed*/);
 
@@ -1341,7 +1341,7 @@
 VOID vboxNetLwfWinStatus(IN NDIS_HANDLE hModuleCtx, IN PNDIS_STATUS_INDICATION pIndication)
 {
-    LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
+    LogFlow(("==>vboxNetLwfWinStatus: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)hModuleCtx;
-    Log((__FUNCTION__"Got status indication: %s\n", vboxNetLwfWinStatusToText(pIndication->StatusCode)));
+    Log(("vboxNetLwfWinStatus: Got status indication: %s\n", vboxNetLwfWinStatusToText(pIndication->StatusCode)));
     switch (pIndication->StatusCode)
     {
@@ -1349,14 +1349,14 @@
             vboxNetLwfWinDumpFilterTypes(*(ULONG*)pIndication->StatusBuffer);
             vboxNetLwfWinOverridePacketFiltersUp(pModuleCtx, (ULONG*)pIndication->StatusBuffer);
-            Log((__FUNCTION__"Reporting status: %s\n", vboxNetLwfWinStatusToText(pIndication->StatusCode)));
+            Log(("vboxNetLwfWinStatus: Reporting status: %s\n", vboxNetLwfWinStatusToText(pIndication->StatusCode)));
             vboxNetLwfWinDumpFilterTypes(*(ULONG*)pIndication->StatusBuffer);
             break;
         case NDIS_STATUS_TASK_OFFLOAD_CURRENT_CONFIG:
-            Log5((__FUNCTION__": offloading currently set to:\n"));
+            Log5(("vboxNetLwfWinStatus: offloading currently set to:\n"));
             vboxNetLwfWinDumpOffloadSettings((PNDIS_OFFLOAD)pIndication->StatusBuffer);
             break;
     }
     NdisFIndicateStatus(pModuleCtx->hFilter, pIndication);
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetLwfWinStatus\n"));
 }
 
@@ -1366,5 +1366,5 @@
     if (!ASMAtomicReadBool(&pModuleCtx->fActive))
     {
-        Log((__FUNCTION__": trunk is inactive, won't forward\n"));
+        Log(("vboxNetLwfWinForwardToIntNet: trunk is inactive, won't forward\n"));
         return false;
     }
@@ -1373,5 +1373,5 @@
     AssertReturn(pModuleCtx->pNetFlt->pSwitchPort, false);
     AssertReturn(pModuleCtx->pNetFlt->pSwitchPort->pfnRecv, false);
-    LogFlow(("==>"__FUNCTION__": module=%p\n", pModuleCtx));
+    LogFlow(("==>vboxNetLwfWinForwardToIntNet: module=%p\n", pModuleCtx));
     Assert(pBufLists);                                                   /* The chain must contain at least one list */
     Assert(NET_BUFFER_LIST_NEXT_NBL(pBufLists) == NULL); /* The caller is supposed to unlink the list from the chain */
@@ -1404,8 +1404,8 @@
             }
         }
-        Log((__FUNCTION__": list=%d buffers=%d\n", nLists, nBuffers));
-    }
-    Log((__FUNCTION__": lists=%d drop=%s don't=%s\n", nLists, fDropIt ? "true":"false", fDontDrop ? "true":"false"));
-    LogFlow(("<=="__FUNCTION__": return '%s'\n",
+        Log(("vboxNetLwfWinForwardToIntNet: list=%d buffers=%d\n", nLists, nBuffers));
+    }
+    Log(("vboxNetLwfWinForwardToIntNet: lists=%d drop=%s don't=%s\n", nLists, fDropIt ? "true":"false", fDontDrop ? "true":"false"));
+    LogFlow(("<==vboxNetLwfWinForwardToIntNet: return '%s'\n",
              fDropIt ? (fDontDrop ? "do not drop (some)" : "drop it") : "do not drop (any)"));
     return fDropIt && !fDontDrop; /* Drop the list if ALL its buffers are being dropped! */
@@ -1414,5 +1414,5 @@
 DECLINLINE(bool) vboxNetLwfWinIsRunning(PVBOXNETLWF_MODULE pModule)
 {
-    Log((__FUNCTION__": state=%d\n", ASMAtomicReadU32(&pModule->enmState)));
+    Log(("vboxNetLwfWinIsRunning: state=%d\n", ASMAtomicReadU32(&pModule->enmState)));
     return ASMAtomicReadU32(&pModule->enmState) == LwfState_Running;
 }
@@ -1421,5 +1421,5 @@
 {
     size_t cb = 0;
-    LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
+    LogFlow(("==>vboxNetLwfWinSendNetBufferLists: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)hModuleCtx;
 #ifdef VBOXNETLWF_NO_BYPASS
@@ -1491,5 +1491,5 @@
 
     }
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetLwfWinSendNetBufferLists\n"));
 }
 
@@ -1497,5 +1497,5 @@
 {
     size_t cb = 0;
-    LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
+    LogFlow(("==>vboxNetLwfWinSendNetBufferListsComplete: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)hModuleCtx;
     PNET_BUFFER_LIST pList = pBufLists;
@@ -1522,11 +1522,11 @@
             else
                 pBufLists = pNextList;
-            Log((__FUNCTION__": our list %p, next=%p, previous=%p, head=%p\n", pList, pNextList, pPrevList, pBufLists));
+            Log(("vboxNetLwfWinSendNetBufferListsComplete: our list %p, next=%p, previous=%p, head=%p\n", pList, pNextList, pPrevList, pBufLists));
             NdisFreeNetBufferList(pList);
 #ifdef VBOXNETLWF_SYNC_SEND
-            Log4((__FUNCTION__ ": freed NBL+NB 0x%p\n", pList));
+            Log4(("vboxNetLwfWinSendNetBufferListsComplete: freed NBL+NB 0x%p\n", pList));
             KeSetEvent(&pModule->EventWire, 0, FALSE);
 #else /* !VBOXNETLWF_SYNC_SEND */
-            Log4((__FUNCTION__ ": freed NBL+NB+MDL+Data 0x%p\n", pList));
+            Log4(("vboxNetLwfWinSendNetBufferListsComplete: freed NBL+NB+MDL+Data 0x%p\n", pList));
             Assert(ASMAtomicReadS32(&pModule->cPendingBuffers) > 0);
             if (ASMAtomicDecS32(&pModule->cPendingBuffers) == 0)
@@ -1537,5 +1537,5 @@
         {
             pPrevList = pList;
-            Log((__FUNCTION__": passing list %p, next=%p, previous=%p, head=%p\n", pList, pNextList, pPrevList, pBufLists));
+            Log(("vboxNetLwfWinSendNetBufferListsComplete: passing list %p, next=%p, previous=%p, head=%p\n", pList, pNextList, pPrevList, pBufLists));
         }
         pList = pNextList;
@@ -1546,5 +1546,5 @@
         NdisFSendNetBufferListsComplete(pModule->hFilter, pBufLists, fFlags);
     }
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetLwfWinSendNetBufferListsComplete\n"));
 }
 
@@ -1556,5 +1556,5 @@
 {
     /// @todo Do we need loopback handling?
-    LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
+    LogFlow(("==>vboxNetLwfWinReceiveNetBufferLists: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)hModuleCtx;
 #ifdef VBOXNETLWF_NO_BYPASS
@@ -1566,4 +1566,5 @@
          */
         NdisFIndicateReceiveNetBufferLists(pModule->hFilter, pBufLists, nPort, nBufLists, fFlags);
+        LogFlow(("<==vboxNetLwfWinReceiveNetBufferLists: inactive trunk\n"));
         return;
     }
@@ -1660,5 +1661,5 @@
                                       fFlags & NDIS_RECEIVE_FLAGS_DISPATCH_LEVEL ? NDIS_RETURN_FLAGS_DISPATCH_LEVEL : 0);
     }
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetLwfWinReceiveNetBufferLists\n"));
 }
 
@@ -1666,5 +1667,5 @@
 {
     size_t cb = 0;
-    LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
+    LogFlow(("==>vboxNetLwfWinReturnNetBufferLists: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)hModuleCtx;
     PNET_BUFFER_LIST pList = pBufLists;
@@ -1693,8 +1694,8 @@
             NdisFreeNetBufferList(pList);
 #ifdef VBOXNETLWF_SYNC_SEND
-            Log4((__FUNCTION__ ": freed NBL+NB 0x%p\n", pList));
+            Log4(("vboxNetLwfWinReturnNetBufferLists: freed NBL+NB 0x%p\n", pList));
             KeSetEvent(&pModule->EventHost, 0, FALSE);
 #else /* !VBOXNETLWF_SYNC_SEND */
-            Log4((__FUNCTION__ ": freed NBL+NB+MDL+Data 0x%p\n", pList));
+            Log4(("vboxNetLwfWinReturnNetBufferLists: freed NBL+NB+MDL+Data 0x%p\n", pList));
             Assert(ASMAtomicReadS32(&pModule->cPendingBuffers) > 0);
             if (ASMAtomicDecS32(&pModule->cPendingBuffers) == 0)
@@ -1711,10 +1712,10 @@
         NdisFReturnNetBufferLists(pModule->hFilter, pBufLists, fFlags);
     }
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetLwfWinReturnNetBufferLists\n"));
 }
 
 NDIS_STATUS vboxNetLwfWinSetModuleOptions(IN NDIS_HANDLE hModuleCtx)
 {
-    LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
+    LogFlow(("==>vboxNetLwfWinSetModuleOptions: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)hModuleCtx;
     NDIS_FILTER_PARTIAL_CHARACTERISTICS PChars;
@@ -1730,5 +1731,5 @@
 #endif
     {
-        Log((__FUNCTION__": active mode\n"));
+        Log(("vboxNetLwfWinSetModuleOptions: active mode\n"));
         PChars.SendNetBufferListsHandler = vboxNetLwfWinSendNetBufferLists;
         PChars.SendNetBufferListsCompleteHandler = vboxNetLwfWinSendNetBufferListsComplete;
@@ -1739,10 +1740,10 @@
     else
     {
-        Log((__FUNCTION__": bypass mode\n"));
+        Log(("vboxNetLwfWinSetModuleOptions: bypass mode\n"));
     }
 #endif
     NDIS_STATUS Status = NdisSetOptionalHandlers(pModuleCtx->hFilter,
                                                  (PNDIS_DRIVER_OPTIONAL_HANDLERS)&PChars);
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("<==vboxNetLwfWinSetModuleOptions: status=0x%x\n", Status));
     return Status;
 }
@@ -1825,5 +1826,5 @@
     if (ASMAtomicCmpXchgU32(&g_VBoxNetLwfGlobals.enmIdcState, LwfIdcState_Connecting, LwfIdcState_Disconnected))
     {
-        Log((__FUNCTION__": IDC state change Diconnected -> Connecting\n"));
+        Log(("vboxNetLwfWinStartInitIdcThread: IDC state change Diconnected -> Connecting\n"));
 
         NTSTATUS Status = PsCreateSystemThread(&g_VBoxNetLwfGlobals.hInitIdcThread,
@@ -1834,5 +1835,5 @@
                                                vboxNetLwfWinInitIdcWorker,
                                                &g_VBoxNetLwfGlobals);
-        Log((__FUNCTION__": create IDC initialization thread, status=0x%x\n", Status));
+        Log(("vboxNetLwfWinStartInitIdcThread: create IDC initialization thread, status=0x%x\n", Status));
         if (Status != STATUS_SUCCESS)
         {
@@ -1841,5 +1842,5 @@
              * We failed to init IDC and there will be no second chance.
              */
-            Log((__FUNCTION__": IDC state change Connecting -> Diconnected\n"));
+            Log(("vboxNetLwfWinStartInitIdcThread: IDC state change Connecting -> Diconnected\n"));
             ASMAtomicWriteU32(&g_VBoxNetLwfGlobals.enmIdcState, LwfIdcState_Disconnected);
         }
@@ -1904,9 +1905,9 @@
 static VOID vboxNetLwfWinUnloadDriver(IN PDRIVER_OBJECT pDriver)
 {
-    LogFlow(("==>"__FUNCTION__": driver=%p\n", pDriver));
+    LogFlow(("==>vboxNetLwfWinUnloadDriver: driver=%p\n", pDriver));
     vboxNetLwfWinDevDestroy(&g_VBoxNetLwfGlobals);
     NdisFDeregisterFilterDriver(g_VBoxNetLwfGlobals.hFilterDriver);
     NdisFreeSpinLock(&g_VBoxNetLwfGlobals.Lock);
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetLwfWinUnloadDriver\n"));
     vboxNetLwfWinFini();
 }
@@ -1938,10 +1939,10 @@
                 /* The state has been changed (the only valid transition is to "Stopping"), undo init */
                 rc = vboxNetFltTryDeleteIdc(&g_VBoxNetFltGlobals);
-                Log((__FUNCTION__": state change (Connecting -> %s) while initializing IDC, deleted IDC, rc=0x%x\n",
+                Log(("vboxNetLwfWinInitIdcWorker: state change (Connecting -> %s) while initializing IDC, deleted IDC, rc=0x%x\n",
                      vboxNetLwfWinIdcStateToText(ASMAtomicReadU32(&pGlobals->enmIdcState)), rc));
             }
             else
             {
-                Log((__FUNCTION__": IDC state change Connecting -> Connected\n"));
+                Log(("vboxNetLwfWinInitIdcWorker: IDC state change Connecting -> Connected\n"));
             }
         }
@@ -1963,5 +1964,5 @@
     uint32_t enmPrevState = ASMAtomicXchgU32(&g_VBoxNetLwfGlobals.enmIdcState, LwfIdcState_Stopping);
 
-    Log((__FUNCTION__": IDC state change %s -> Stopping\n", vboxNetLwfWinIdcStateToText(enmPrevState)));
+    Log(("vboxNetLwfWinTryFiniIdc: IDC state change %s -> Stopping\n", vboxNetLwfWinIdcStateToText(enmPrevState)));
 
     switch (enmPrevState)
@@ -1972,5 +1973,5 @@
         case LwfIdcState_Stopping:
             /* Impossible, but another thread is alreading doing FiniIdc, bail out */
-            Log(("ERROR: "__FUNCTION__"() called in 'Stopping' state\n"));
+            Log(("ERROR! vboxNetLwfWinTryFiniIdc: called in 'Stopping' state\n"));
             rc = VERR_INVALID_STATE;
             break;
@@ -1987,5 +1988,5 @@
             else
             {
-                Log(("ERROR in "__FUNCTION__": ObReferenceObjectByHandle(%p) failed with 0x%x\n",
+                Log(("ERROR! vboxNetLwfWinTryFiniIdc: ObReferenceObjectByHandle(%p) failed with 0x%x\n",
                      g_VBoxNetLwfGlobals.hInitIdcThread, Status));
             }
@@ -1995,5 +1996,5 @@
             /* the worker succeeded in IDC init and terminated */
             rc = vboxNetFltTryDeleteIdc(&g_VBoxNetFltGlobals);
-            Log((__FUNCTION__": deleted IDC, rc=0x%x\n", rc));
+            Log(("vboxNetLwfWinTryFiniIdc: deleted IDC, rc=0x%x\n", rc));
             break;
     }
@@ -2050,6 +2051,6 @@
 bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThis)
 {
-    LogFlow(("==>"__FUNCTION__": instance=%p\n", pThis));
-    LogFlow(("<=="__FUNCTION__": return %RTbool\n", !ASMAtomicUoReadBool(&pThis->fDisconnectedFromHost)));
+    LogFlow(("==>vboxNetFltOsMaybeRediscovered: instance=%p\n", pThis));
+    LogFlow(("<==vboxNetFltOsMaybeRediscovered: return %RTbool\n", !ASMAtomicUoReadBool(&pThis->fDisconnectedFromHost)));
     /* AttachToInterface true if disconnected */
     return !ASMAtomicUoReadBool(&pThis->fDisconnectedFromHost);
@@ -2061,8 +2062,8 @@
 
     PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)pThis->u.s.WinIf.hModuleCtx;
-    LogFlow(("==>"__FUNCTION__": instance=%p module=%p\n", pThis, pModule));
+    LogFlow(("==>vboxNetFltPortOsXmit: instance=%p module=%p\n", pThis, pModule));
     if (!pModule)
     {
-        LogFlow(("<=="__FUNCTION__": pModule is null, return %d\n", VERR_INTERNAL_ERROR));
+        LogFlow(("<==vboxNetFltPortOsXmit: pModule is null, return %d\n", VERR_INTERNAL_ERROR));
         return VERR_INTERNAL_ERROR;
     }
@@ -2130,5 +2131,5 @@
         if (Status != STATUS_SUCCESS)
         {
-            Log(("ERROR! "__FUNCTION__": KeWaitForMultipleObjects() failed with 0x%x\n", Status));
+            Log(("ERROR! vboxNetFltPortOsXmit: KeWaitForMultipleObjects() failed with 0x%x\n", Status));
             if (Status == STATUS_TIMEOUT)
                 rc = VERR_TIMEOUT;
@@ -2140,5 +2141,5 @@
     NDIS_RELEASE_MUTEX(&pModule->InTransmit);
 
-    LogFlow(("<=="__FUNCTION__": return %d\n", rc));
+    LogFlow(("<==vboxNetFltPortOsXmit: return %d\n", rc));
     return rc;
 }
@@ -2147,8 +2148,8 @@
 {
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)pThis->u.s.WinIf.hModuleCtx;
-    LogFlow(("==>"__FUNCTION__": instance=%p module=%p fActive=%RTbool\n", pThis, pModuleCtx, fActive));
+    LogFlow(("==>vboxNetFltPortOsSetActive: instance=%p module=%p fActive=%RTbool\n", pThis, pModuleCtx, fActive));
     if (!pModuleCtx)
     {
-        LogFlow(("<=="__FUNCTION__": pModuleCtx is null\n"));
+        LogFlow(("<==vboxNetFltPortOsSetActive: pModuleCtx is null\n"));
         return;
     }
@@ -2162,14 +2163,14 @@
         NdisFRestartFilter(pModuleCtx->hFilter);
         Status = vboxNetLwfWinSetPacketFilter(pModuleCtx, fActive);
-        LogFlow(("<=="__FUNCTION__": vboxNetLwfWinSetPacketFilter() returned 0x%x\n", Status));
+        LogFlow(("<==vboxNetFltPortOsSetActive: vboxNetLwfWinSetPacketFilter() returned 0x%x\n", Status));
     }
     else
-        LogFlow(("<=="__FUNCTION__": no change, remain %sactive\n", fActive ? "":"in"));
+        LogFlow(("<==vboxNetFltPortOsSetActive: no change, remain %sactive\n", fActive ? "":"in"));
 }
 
 int vboxNetFltOsDisconnectIt(PVBOXNETFLTINS pThis)
 {
-    LogFlow(("==>"__FUNCTION__": instance=%p\n", pThis));
-    LogFlow(("<=="__FUNCTION__": return 0\n"));
+    LogFlow(("==>vboxNetFltOsDisconnectIt: instance=%p\n", pThis));
+    LogFlow(("<==vboxNetFltOsDisconnectIt: return 0\n"));
     return VINF_SUCCESS;
 }
@@ -2177,6 +2178,6 @@
 int vboxNetFltOsConnectIt(PVBOXNETFLTINS pThis)
 {
-    LogFlow(("==>"__FUNCTION__": instance=%p\n", pThis));
-    LogFlow(("<=="__FUNCTION__": return 0\n"));
+    LogFlow(("==>vboxNetFltOsConnectIt: instance=%p\n", pThis));
+    LogFlow(("<==vboxNetFltOsConnectIt: return 0\n"));
     return VINF_SUCCESS;
 }
@@ -2203,5 +2204,5 @@
         {
             case AF_INET:
-                Log((__FUNCTION__": %s IPv4 addr=%RTnaipv4 on luid=(%u,%u)\n",
+                Log(("vboxNetLwfWinIpAddrChangeCallback: %s IPv4 addr=%RTnaipv4 on luid=(%u,%u)\n",
                      fAdded ? "add" : "remove", pRow->Address.Ipv4.sin_addr,
                      pRow->InterfaceLuid.Info.IfType, pRow->InterfaceLuid.Info.NetLuidIndex));
@@ -2210,5 +2211,5 @@
                 break;
             case AF_INET6:
-                Log((__FUNCTION__": %s IPv6 addr=%RTnaipv6 luid=(%u,%u)\n",
+                Log(("vboxNetLwfWinIpAddrChangeCallback: %s IPv6 addr=%RTnaipv6 luid=(%u,%u)\n",
                      fAdded ? "add" : "remove", &pRow->Address.Ipv6.sin6_addr,
                      pRow->InterfaceLuid.Info.IfType, pRow->InterfaceLuid.Info.NetLuidIndex));
@@ -2219,5 +2220,5 @@
     }
     else
-        Log((__FUNCTION__": pRow=%p pfnNotifyHostAddress=%p\n",
+        Log(("vboxNetLwfWinIpAddrChangeCallback: pRow=%p pfnNotifyHostAddress=%p\n",
              pRow, pThis->pSwitchPort->pfnNotifyHostAddress));
 }
@@ -2233,16 +2234,16 @@
         if (NETIO_SUCCESS(Status))
         {
-            for (int i = 0; i < HostIpAddresses->NumEntries; i++)
+            for (unsigned i = 0; i < HostIpAddresses->NumEntries; i++)
                 vboxNetLwfWinIpAddrChangeCallback(pThis, &HostIpAddresses->Table[i], MibAddInstance);
         }
         else
-            Log((__FUNCTION__": GetUnicastIpAddressTable failed with %x\n", Status));
+            Log(("ERROR! vboxNetLwfWinRegisterIpAddrNotifier: GetUnicastIpAddressTable failed with %x\n", Status));
         /* Now we can register a callback function to keep track of address changes. */
         Status = NotifyUnicastIpAddressChange(AF_UNSPEC, vboxNetLwfWinIpAddrChangeCallback,
                                               pThis, false, &pThis->u.s.WinIf.hNotifier);
         if (NETIO_SUCCESS(Status))
-            Log((__FUNCTION__": notifier=%p\n", pThis->u.s.WinIf.hNotifier));
+            Log(("vboxNetLwfWinRegisterIpAddrNotifier: notifier=%p\n", pThis->u.s.WinIf.hNotifier));
         else
-            Log((__FUNCTION__": NotifyUnicastIpAddressChange failed with %x\n", Status));
+            Log(("ERROR! vboxNetLwfWinRegisterIpAddrNotifier: NotifyUnicastIpAddressChange failed with %x\n", Status));
     }
     else
@@ -2252,5 +2253,5 @@
 void vboxNetLwfWinUnregisterIpAddrNotifier(PVBOXNETFLTINS pThis)
 {
-    Log((__FUNCTION__": notifier=%p\n", pThis->u.s.WinIf.hNotifier));
+    Log(("vboxNetLwfWinUnregisterIpAddrNotifier: notifier=%p\n", pThis->u.s.WinIf.hNotifier));
     if (pThis->u.s.WinIf.hNotifier)
         CancelMibChangeNotify2(pThis->u.s.WinIf.hNotifier);
@@ -2260,5 +2261,5 @@
 {
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)pThis->u.s.WinIf.hModuleCtx;
-    LogFlow(("==>"__FUNCTION__": instance=%p module=%p\n", pThis, pModuleCtx));
+    LogFlow(("==>vboxNetFltOsDeleteInstance: instance=%p module=%p\n", pThis, pModuleCtx));
     /* Cancel IP address change notifications */
     vboxNetLwfWinUnregisterIpAddrNotifier(pThis);
@@ -2270,5 +2271,5 @@
         pThis->u.s.WinIf.hModuleCtx = NULL;
     }
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetFltOsDeleteInstance\n"));
 }
 
@@ -2290,7 +2291,7 @@
 int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, void *pvContext)
 {
-    LogFlow(("==>"__FUNCTION__": instance=%p context=%p\n", pThis, pvContext));
+    LogFlow(("==>vboxNetFltOsInitInstance: instance=%p context=%p\n", pThis, pvContext));
     AssertReturn(pThis, VERR_INVALID_PARAMETER);
-    Log((__FUNCTION__": trunk name=%s\n", pThis->szName));
+    Log(("vboxNetFltOsInitInstance: trunk name=%s\n", pThis->szName));
     ANSI_STRING strInst;
     RtlInitAnsiString(&strInst, pThis->szName);
@@ -2301,14 +2302,14 @@
         if (RtlEqualString(&strInst, &pModuleCtx->strMiniportName, TRUE))
         {
-            Log((__FUNCTION__": found matching module, name=%s\n", pThis->szName));
+            Log(("vboxNetFltOsInitInstance: found matching module, name=%s\n", pThis->szName));
             pThis->u.s.WinIf.hModuleCtx = pModuleCtx;
             pModuleCtx->pNetFlt = pThis;
             vboxNetLwfWinReportCapabilities(pThis, pModuleCtx);
             vboxNetLwfWinRegisterIpAddrNotifier(pThis);
-            LogFlow(("<=="__FUNCTION__": return 0\n"));
+            LogFlow(("<==vboxNetFltOsInitInstance: return 0\n"));
             return VINF_SUCCESS;
         }
     }
-    LogFlow(("<=="__FUNCTION__": return VERR_INTNET_FLT_IF_NOT_FOUND\n"));
+    LogFlow(("<==vboxNetFltOsInitInstance: return VERR_INTNET_FLT_IF_NOT_FOUND\n"));
     return VERR_INTNET_FLT_IF_NOT_FOUND;
 }
@@ -2316,8 +2317,8 @@
 int vboxNetFltOsPreInitInstance(PVBOXNETFLTINS pThis)
 {
-    LogFlow(("==>"__FUNCTION__": instance=%p\n", pThis));
+    LogFlow(("==>vboxNetFltOsPreInitInstance: instance=%p\n", pThis));
     pThis->u.s.WinIf.hModuleCtx = 0;
     pThis->u.s.WinIf.hNotifier  = NULL;
-    LogFlow(("<=="__FUNCTION__": return 0\n"));
+    LogFlow(("<==vboxNetFltOsPreInitInstance: return 0\n"));
     return VINF_SUCCESS;
 }
@@ -2325,12 +2326,12 @@
 void vboxNetFltPortOsNotifyMacAddress(PVBOXNETFLTINS pThis, void *pvIfData, PCRTMAC pMac)
 {
-    LogFlow(("==>"__FUNCTION__": instance=%p data=%p mac=%RTmac\n", pThis, pvIfData, pMac));
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetFltPortOsNotifyMacAddress: instance=%p data=%p mac=%RTmac\n", pThis, pvIfData, pMac));
+    LogFlow(("<==vboxNetFltPortOsNotifyMacAddress\n"));
 }
 
 int vboxNetFltPortOsConnectInterface(PVBOXNETFLTINS pThis, void *pvIf, void **ppvIfData)
 {
-    LogFlow(("==>"__FUNCTION__": instance=%p if=%p data=%p\n", pThis, pvIf, ppvIfData));
-    LogFlow(("<=="__FUNCTION__": return 0\n"));
+    LogFlow(("==>vboxNetFltPortOsConnectInterface: instance=%p if=%p data=%p\n", pThis, pvIf, ppvIfData));
+    LogFlow(("<==vboxNetFltPortOsConnectInterface: return 0\n"));
     /* Nothing to do */
     return VINF_SUCCESS;
@@ -2339,6 +2340,6 @@
 int vboxNetFltPortOsDisconnectInterface(PVBOXNETFLTINS pThis, void *pvIfData)
 {
-    LogFlow(("==>"__FUNCTION__": instance=%p data=%p\n", pThis, pvIfData));
-    LogFlow(("<=="__FUNCTION__": return 0\n"));
+    LogFlow(("==>vboxNetFltPortOsDisconnectInterface: instance=%p data=%p\n", pThis, pvIfData));
+    LogFlow(("<==vboxNetFltPortOsDisconnectInterface: return 0\n"));
     /* Nothing to do */
     return VINF_SUCCESS;
