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

Timestamp:

Jul 9, 2010 5:26:55 PM (14 years ago)

Author:

vboxsync

Message:

vboxnetflt: RHEL 5 GRO fix

File:

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

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

@@ -122 +122 @@
 #endif
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+/** This enables or disables handling of GSO frames coming from the wire (GRO). */
+# define VBOXNETFLT_WITH_GRO                1
+#endif
+/*
+ * GRO support was backported to RHEL 5.4
+ */
+#ifdef RHEL_RELEASE_CODE
+# if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(5, 4)
+#  define VBOXNETFLT_WITH_GRO               1
+# endif
+#endif
 
 /*******************************************************************************
@@ -1425 +1437 @@
     {
         Log5(("vboxNetFltLinuxCanForwardAsGso: fSrc=wire\n"));
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+#ifdef VBOXNETFLT_WITH_GRO
         /*
          * The packet came from the wire and the driver has already consumed
@@ -1434 +1446 @@
         Log5(("vboxNetFltLinuxCanForwardAsGso: mac_len=%d data=%p mac_header=%p network_header=%p\n",
               pSkb->mac_len, pSkb->data, skb_mac_header(pSkb), skb_network_header(pSkb)));
-#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) */
+#else /* !VBOXNETFLT_WITH_GRO */
         /* Older kernels didn't have GRO. */
         return false;
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) */
+#endif /* !VBOXNETFLT_WITH_GRO */
     }
     else