Changeset 20414 in vbox for trunk

Timestamp:

Jun 8, 2009 7:46:24 PM (16 years ago)

Author:

vboxsync

Message:

#3783: Apply the workaround to pre-2.6.18 kernels as well.

File:

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

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

@@ -660 +660 @@
         if (pBuf->ip_summed == CHECKSUM_PARTIAL && pBuf->pkt_type == PACKET_OUTGOING)
         {
-#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 18)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18)
             /*
-             * Try to work around the problem with CentOS 5.2 (2.6.18 kernel),
-             * it passes wrong 'h' pointer down. We take IP header length from
-             * the header itself and reconstruct 'h' pointer to TCP (or whatever)
-             * header.
+             * Try to work around the problem with CentOS 4.7 and 5.2 (2.6.9
+             * and 2.6.18 kernels), they pass wrong 'h' pointer down. We take IP
+             * header length from the header itself and reconstruct 'h' pointer
+             * to TCP (or whatever) header.
              */
             unsigned char *tmp = pBuf->h.raw;
             if (pBuf->h.raw == pBuf->nh.raw && pBuf->protocol == htons(ETH_P_IP))
                 pBuf->h.raw = pBuf->nh.raw + pBuf->nh.iph->ihl * 4;
-#endif /* LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 18) */
+#endif /* LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18) */
             if (VBOX_SKB_CHECKSUM_HELP(pBuf))
             {
@@ -677 +677 @@
                 return;
             }
-#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 18)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18)
             /* Restore the original (wrong) pointer. */
             pBuf->h.raw = tmp;
-#endif /* LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 18) */
+#endif /* LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18) */
         }
         vboxNetFltLinuxForwardSegment(pThis, pBuf, fSrc);