Changeset 31626 in vbox for trunk/src/VBox

Timestamp:

Aug 13, 2010 5:37:54 AM (14 years ago)

Author:

vboxsync

Message:

Reverted r64750 as it was inconvenient for backporting

File:

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

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

@@ -2232 +2232 @@
 int vboxNetFltOsDisconnectIt(PVBOXNETFLTINS pThis)
 {
-#ifdef VBOXNETFLT_WITH_QDISC
-    vboxNetFltLinuxQdiscRemove(pThis, NULL);
-#endif /* VBOXNETFLT_WITH_QDISC */
-    dev_remove_pack(&pThis->u.s.PacketType);
+    /* Nothing to do here. */
     return VINF_SUCCESS;
 }
@@ -2274 +2271 @@
     vboxNetFltLinuxUnhookDev(pThis, NULL);
 #endif
+#ifdef VBOXNETFLT_WITH_QDISC
+    vboxNetFltLinuxQdiscRemove(pThis, NULL);
+#endif /* VBOXNETFLT_WITH_QDISC */
 
     /** @todo This code may race vboxNetFltLinuxUnregisterDevice (very very
@@ -2287 +2287 @@
     if (fRegistered)
     {
+        dev_remove_pack(&pThis->u.s.PacketType);
 #ifndef VBOXNETFLT_LINUX_NO_XMIT_QUEUE
         skb_queue_purge(&pThis->u.s.XmitQueue);