Changeset 35382 in vbox for trunk/src

Timestamp:

Dec 30, 2010 4:17:50 PM (14 years ago)

Author:

vboxsync

Message:

vboxnetflt: fix for host panic when bridging to devices with no TX queue

File:

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

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

@@ -584 +584 @@
 
     struct Qdisc *pExisting = QDISC_GET(pDev);
+    /* Do not install our qdisc for devices with no TX queues */
+    if (!pExisting->enqueue)
+        return;
     if (strcmp(pExisting->ops->id, "vboxnetflt"))
     {
@@ -669 +672 @@
     if (strcmp(pQdisc->ops->id, "vboxnetflt"))
     {
-        /* Looks like the user has replaced our qdisc manually. */
-        printk("VBoxNetFlt: Failed to detach qdisc, wrong qdisc: %s\n",
-               pQdisc->ops->id);
+        if (pQdisc->enqueue)
+        {
+            /* Looks like the user has replaced our qdisc manually. */
+            printk("VBoxNetFlt: Failed to detach qdisc, wrong qdisc: %s\n",
+                   pQdisc->ops->id);
+        }
         return; // TODO: Consider returing an error
     }