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

Timestamp:

Oct 18, 2011 2:11:56 PM (13 years ago)

Author:

vboxsync

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

74425

Message:

netflt: renamed host-to-wire filter conditionals, updated comments

File:

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

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

@@ -51 +51 @@
 #include "../VBoxNetFltInternal.h"
 
-#define VBOXNETFLT_WITH_FILTER_HOST2GUEST_SKBS_EXPERIMENT
-
 
 /*******************************************************************************
@@ -245 +243 @@
 
 /**
- * Experiment where we filter traffic from the host to the internal network
+ * We filter traffic from the host to the internal network
  * before it reaches the NIC driver.
  *
- * The current code uses a very ugly hack and only works on kernels using the
- * net_device_ops (>= 2.6.29).  It has been shown to give us a
- * performance boost of 60-100% though.  So, we have to find some less hacky way
- * of getting this job done eventually.
- *
- * #define VBOXNETFLT_WITH_FILTER_HOST2GUEST_SKBS_EXPERIMENT
- */
-#ifdef VBOXNETFLT_WITH_FILTER_HOST2GUEST_SKBS_EXPERIMENT
+ * The current code uses a very ugly hack overriding hard_start_xmit
+ * callback in the device structure, but it has been shown to give us a
+ * performance boost of 60-100% though. Eventually we have to find some
+ * less hacky way of getting this job done.
+ */
+#define VBOXNETFLT_WITH_HOST2WIRE_FILTER
+
+#ifdef VBOXNETFLT_WITH_HOST2WIRE_FILTER
 
 # if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
@@ -454 +452 @@
 }
 
-#endif /* VBOXNETFLT_WITH_FILTER_HOST2GUEST_SKBS_EXPERIMENT */
+#endif /* VBOXNETFLT_WITH_HOST2WIRE_FILTER */
 
 
@@ -1512 +1510 @@
     dev_add_pack(&pThis->u.s.PacketType);
 
-#ifdef VBOXNETFLT_WITH_FILTER_HOST2GUEST_SKBS_EXPERIMENT
+#ifdef VBOXNETFLT_WITH_HOST2WIRE_FILTER
     vboxNetFltLinuxHookDev(pThis, pDev);
 #endif
@@ -1555 +1553 @@
     else
     {
-#ifdef VBOXNETFLT_WITH_FILTER_HOST2GUEST_SKBS_EXPERIMENT
+#ifdef VBOXNETFLT_WITH_HOST2WIRE_FILTER
         vboxNetFltLinuxUnhookDev(pThis, pDev);
 #endif
@@ -1583 +1581 @@
     Assert(!pThis->fDisconnectedFromHost);
 
-#ifdef VBOXNETFLT_WITH_FILTER_HOST2GUEST_SKBS_EXPERIMENT
+#ifdef VBOXNETFLT_WITH_HOST2WIRE_FILTER
     vboxNetFltLinuxUnhookDev(pThis, pDev);
 #endif
@@ -1884 +1882 @@
     RTSPINLOCKTMP       Tmp = RTSPINLOCKTMP_INITIALIZER;
 
-#ifdef VBOXNETFLT_WITH_FILTER_HOST2GUEST_SKBS_EXPERIMENT
+#ifdef VBOXNETFLT_WITH_HOST2WIRE_FILTER
     vboxNetFltLinuxUnhookDev(pThis, NULL);
 #endif