Changeset 38054 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/linux

Timestamp:

Jul 19, 2011 8:50:19 AM (14 years ago)

Author:

vboxsync

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

72997

Message:

netflt: fix for regression introduced in r72926

File:

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

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

@@ -963 +963 @@
         return;
     pOverride->pOrgOps              = pDev->OVR_OPS;
+    /* We only need to save ethtool_ops structure if it is present (#5712) */
+    if (VALID_PTR(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) */