Changeset 31654 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

Timestamp:

Aug 13, 2010 2:38:49 PM (14 years ago)

Author:

vboxsync

Message:

vboxnetflt: qdisc stability fixes

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (4 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

@@ -352 +352 @@
 {
     PVBOXNETQDISCPRIV pPriv = qdisc_priv(sch);
-
-    ++sch->qstats.drops;
-    --sch->q.qlen;
+    unsigned int cbLen;
+
     if (pPriv->pChild->ops->drop)
-        return pPriv->pChild->ops->drop(pPriv->pChild);
+    {
+        cbLen = pPriv->pChild->ops->drop(pPriv->pChild);
+        if (cbLen != 0)
+        {
+            ++sch->qstats.drops;
+            --sch->q.qlen;
+            return cbLen;
+        }
+    }
 
     return 0;
@@ -607 +614 @@
 # endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32) */
 #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) */
+        /* Synch the queue len with our child */
+        pNew->q.qlen = pPriv->pChild->q.qlen;
     }
     else
@@ -2232 +2241 @@
 int vboxNetFltOsDisconnectIt(PVBOXNETFLTINS pThis)
 {
+#ifdef VBOXNETFLT_WITH_QDISC
+    vboxNetFltLinuxQdiscRemove(pThis, NULL);
+#endif /* VBOXNETFLT_WITH_QDISC */
     /*
      * Remove packet handler when we get disconnected from internal switch as
@@ -2275 +2287 @@
     vboxNetFltLinuxUnhookDev(pThis, NULL);
 #endif
-#ifdef VBOXNETFLT_WITH_QDISC
-    vboxNetFltLinuxQdiscRemove(pThis, NULL);
-#endif /* VBOXNETFLT_WITH_QDISC */
 
     /** @todo This code may race vboxNetFltLinuxUnregisterDevice (very very