--- elwix/config/ELWIX_i386	2017/06/08 13:13:56	1.6.2.1
+++ elwix/config/ELWIX_i386	2017/12/27 21:13:00	1.6.2.4
@@ -1,4 +1,4 @@
-# $Id: ELWIX_i386,v 1.6.2.1 2017/06/08 13:13:56 misho Exp $
+# $Id: ELWIX_i386,v 1.6.2.4 2017/12/27 21:13:00 misho Exp $
 # $FreeBSD: head/sys/i386/conf/GENERIC 310177 2016-12-16 21:10:37Z jhb $
 
 cpu		I486_CPU
@@ -17,9 +17,11 @@ makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace
 
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
+options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	IPSEC			# IP (v4/v6) security
+options 	IPSEC_SUPPORT		# Allow kldload of ipsec and tcpmd5
 options 	TCP_HHOOK		# hhook(9) framework for TCP
 options 	TCP_OFFLOAD		# TCP offload
 options 	SCTP			# Stream Control Transmission Protocol
@@ -82,7 +84,6 @@ options 	MAC			# TrustedBSD MAC Framework
 options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 options 	DDB_CTF			# Kernel ELF linker loads CTF data
 options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
-options 	FLOWTABLE		# per-cpu routing cache
 options 	RACCT			# Resource accounting framework
 options 	RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default
 options 	RCTL			# Resource limits
@@ -125,10 +126,10 @@ device		siis			# SiliconImage SiI3124/SiI3132/SiI3531 
 
 # SCSI Controllers
 device		ahc			# AHA2940 and onboard AIC7xxx devices
-options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
+#options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
 					# output.  Adds ~128k to driver.
-device		ahd			# AHA39320/29320 and onboard AIC79xx devices
-options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
+#device		ahd			# AHA39320/29320 and onboard AIC79xx devices
+#options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
 					# output.  Adds ~215k to driver.
 device		esp			# AMD Am53C974 (Tekram DC-390(T))
 device		hptiop			# Highpoint RocketRaid 3xxx series
@@ -305,7 +306,7 @@ device		ie			# EtherExpress 8/16, 3C507, StarLAN 10 et
 device		sn			# SMC's 9000 series of Ethernet chips
 device		xe			# Xircom pccard Ethernet
 
-options		XBONEHACK
+#options		XBONEHACK
 device		wlan_acl
 device		wlan_xauth
 device		wlan_rssadapt
@@ -341,7 +342,6 @@ device		malo			# Marvell Libertas wireless NICs.
 device		mwl			# Marvell 88W8363 802.11n wireless NICs.
 device		ral			# Ralink Technology RT2500 wireless NICs.
 device		wi			# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-#device		wl			# Older non 802.11 Wavelan wireless NIC.
 device		wpi			# Intel 3945ABG wireless NICs.
 
 device		iwifw
@@ -439,8 +439,7 @@ device		virtio_blk		# VirtIO Block device
 device		virtio_scsi		# VirtIO SCSI device
 device		virtio_balloon		# VirtIO Memory Balloon device
 
-# HyperV drivers and enchancement support
-options		HYPERV			# Hyper-V kernel infrastructure
+# HyperV drivers and enhancement support
 device		hyperv			# HyperV drivers 
 
 # Xen HVM Guest Optimizations
@@ -456,8 +455,12 @@ device		crypto			# Required by IPSEC
 
 ### ELWIX Additional custom settings ...
 
-#device		iscsi_initiator
+# Add multiple route table support
+#options     ROUTETABLES=16
 
+device		iscsi
+#device		iser
+
 device		if_bridge
 device		tap
 device		gre
@@ -476,7 +479,6 @@ device		pfsync
 device		hifn
 device		enc
 device		cryptodev
-options		IPSEC_NAT_T
 options		TCP_SIGNATURE       #include support for RFC 2385
 
 options		ALTQ
@@ -599,7 +601,6 @@ device		vxlan
 
 #device		disc
 #device		edsc
-options		VIMAGE
 #device		epair
 device		stf
 
@@ -614,4 +615,4 @@ options 	ACCEPT_FILTER_HTTP
 options 	SW_WATCHDOG
 
 device		etherswitch
-device		rtl8366rb
+#device		rtl8366rb