Changeset 13707 in vbox

Timestamp:

Oct 31, 2008 9:17:45 AM (16 years ago)

Author:

vboxsync

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

38673

Message:

Solaris/VBoxNetFlt: Re-enabled vboxnetflt to resolve iprt from vboxdrv.

Location:

trunk/src/VBox/HostDrivers

Files:

• Support/Makefile.kmk (modified) (1 diff)
• Support/solaris/SUPDrv-solaris.c (modified) (1 diff)
• VBoxNetFlt/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -393 +393 @@
 vboxdrv_DEFS         += VBOX_WITH_IDT_PATCHING
 endif
-# Disabled temporarily
-#ifdef VBOX_WITH_NETFLT
-#vboxdrv_DEFS         += VBOX_WITH_NETFLT
-#endif
+ifdef VBOX_WITH_NETFLT
+ vboxdrv_DEFS         += VBOX_WITH_NETFLT
+endif
 vboxdrv_DEFS         += VBOX_SVN_REV=$(VBOX_SVN_REV)
 vboxdrv_DEPS         += $(VBOX_SVN_REV_KMK)

trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c

@@ -197 +197 @@
     LogFlow((DEVICE_NAME ":_init\n"));
 
-#ifdef VBOX_WITH_NETFLT
-    NOREF(g_vboxNetFltSolarisRTR0Symbols);
-#endif
-
     /*
      * Prevent module autounloading.

trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

@@ -132 +132 @@
         $(PATH_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
 ## @todo vboxflt should resolves all the IPRT bits from vboxdrv.
-vboxnetflt_LIBS += \
-        $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
+#vboxnetflt_LIBS += \
+#       $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
 vboxnetflt_SOURCES.linux = linux/VBoxNetFlt-linux.c
 vboxnetflt_SOURCES.solaris = solaris/VBoxNetFlt-solaris.c