Changeset 38052 in vbox

Timestamp:

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

Author:

vboxsync

Message:

backed out r72992

File:

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

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

@@ -906 +906 @@
     if (   !VALID_PTR(pOverride)
         || pOverride->u32Magic != VBOXNETDEVICEOPSOVERRIDE_MAGIC
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) || defined(VBOXNETFLT_WITH_GRO)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
         || !VALID_PTR(pOverride->pOrgOps)
-# endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) || defined(VBOXNETFLT_WITH_GRO) */
+# endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */
         )
     {
@@ -963 +963 @@
         return;
     pOverride->pOrgOps              = pDev->OVR_OPS;
-# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) && !defined(VBOXNETFLT_WITH_GRO)
+# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
     /**
      * There is no need to save ethtool_ops structure since we only modify
@@ -969 +969 @@
      */
     pOverride->pfnStartXmit         = pDev->hard_start_xmit;
-# else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) || defined(VBOXNETFLT_WITH_GRO) */
+# else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */
     pOverride->Ops                  = *pDev->OVR_OPS;
     pOverride->Ops.ndo_start_xmit   = vboxNetFltLinuxStartXmitFilter;