Changeset 37993 in vbox for trunk

Timestamp:

Jul 18, 2011 9:42:33 AM (13 years ago)

Author:

vboxsync

Message:

netflt: Attempt to fix host-only networking crash for pre-2.6.29 kernels

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (1 diff)

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

@@ -960 +960 @@
         return;
     pOverride->pOrgOps              = pDev->OVR_OPS;
-    pOverride->Ops                  = *pDev->OVR_OPS;
 # if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
+    /**
+     * There is no need to save ethtool_ops structure since we only modify
+     * the pointer itself and the structure is optional (#5712).
+     */
     pOverride->pfnStartXmit         = pDev->hard_start_xmit;
 # else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */
+    pOverride->Ops                  = *pDev->OVR_OPS;
     pOverride->Ops.ndo_start_xmit   = vboxNetFltLinuxStartXmitFilter;
 # endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */