Changeset 44355 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Jan 24, 2013 1:27:28 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

83319

Message:

PDMNetShaper: Cleanups & fixes (untested). PVM -> PUVM. Note: cs is a register within the VMM, not critical section. :)

File:

• trunk/src/VBox/Devices/Network/DrvNetShaper.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Network/DrvNetShaper.cpp

@@ -128 +128 @@
     STAM_REL_COUNTER_ADD(&pThis->StatXmitBytesRequested, cbMin);
     STAM_REL_COUNTER_INC(&pThis->StatXmitPktsRequested);
-#ifdef IN_RING3
-    if (!PDMR3NsAllocateBandwidth(&pThis->Filter, cbMin))
-    {
-        STAM_REL_COUNTER_ADD(&pThis->StatXmitBytesDenied, cbMin);
-        STAM_REL_COUNTER_INC(&pThis->StatXmitPktsDenied);
-        return VERR_TRY_AGAIN;
-    }
-#endif
-#ifdef IN_RING0
-    if (!PDMR0NsAllocateBandwidth(&pThis->Filter, cbMin))
+#if defined(IN_RING3) || defined(IN_RING0)
+    if (!PDMNsAllocateBandwidth(&pThis->Filter, cbMin))
     {
         STAM_REL_COUNTER_ADD(&pThis->StatXmitBytesDenied, cbMin);
@@ -477 +469 @@
         rc = VINF_SUCCESS;
 
-    pThis->Filter.pIDrvNet = &pThis->INetworkDown;
+    pThis->Filter.pIDrvNetR3 = &pThis->INetworkDown;
     rc = PDMDrvHlpNetShaperAttach(pDrvIns, pThis->pszBwGroup, &pThis->Filter);
     if (RT_FAILURE(rc))