--- elwix/config/ELWIX_i386	2016/12/15 14:32:50	1.5.2.5
+++ elwix/config/ELWIX_i386	2017/08/22 14:36:56	1.6.2.3
@@ -1,5 +1,5 @@
-# $Id: ELWIX_i386,v 1.5.2.5 2016/12/15 14:32:50 misho Exp $
-# $FreeBSD: head/sys/i386/conf/GENERIC 299142 2016-05-05 22:26:23Z jhb $
+# $Id: ELWIX_i386,v 1.6.2.3 2017/08/22 14:36:56 misho Exp $
+# $FreeBSD: head/sys/i386/conf/GENERIC 310177 2016-12-16 21:10:37Z jhb $
 
 cpu		I486_CPU
 cpu		I586_CPU
@@ -13,7 +13,7 @@ hints		"ELWIX_i386.hints"	# Default places to look for
 options 	INIT_PATH=/sbin/initx:/sbin/init
 
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-#makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
+makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
 
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
@@ -62,6 +62,7 @@ options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
 options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
 options 	COMPAT_FREEBSD9		# Compatible with FreeBSD9
 options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
+options 	COMPAT_FREEBSD11	# Compatible with FreeBSD11
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	STACK			# stack(9) support
@@ -78,20 +79,19 @@ options 	AUDIT			# Security event auditing
 options 	CAPABILITY_MODE		# Capsicum capability mode
 options 	CAPABILITIES		# Capsicum capabilities
 options 	MAC			# TrustedBSD MAC Framework
-#options 	KDTRACE_HOOKS		# Kernel DTrace hooks
-#options 	DDB_CTF			# Kernel ELF linker loads CTF data
+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
 
 # Debugging support.  Always need this:
-#options 	KDB			# Enable kernel debugger support.
-#options 	KDB_TRACE		# Print a stack trace for a panic.
+options 	KDB			# Enable kernel debugger support.
+options 	KDB_TRACE		# Print a stack trace for a panic.
 # For full debugger support use (turn off in stable branch):
-#options 	DDB			# Support DDB.
-#options 	GDB			# Support remote GDB.
+options 	DDB			# Support DDB.
+options 	GDB			# Support remote GDB.
 #options 	DEADLKRES		# Enable the deadlock resolver
 #options 	INVARIANTS		# Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
@@ -102,6 +102,7 @@ options 	RCTL			# Resource limits
 # To make an SMP kernel, the next two lines are needed
 options 	SMP			# Symmetric MultiProcessor Kernel
 device		apic			# I/O APIC
+options 	EARLY_AP_STARTUP
 
 # CPU frequency control
 device		cpufreq
@@ -240,7 +241,6 @@ device		puc			# Multi I/O cards and multi-channel UART
 device		bxe			# Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE
 device		de			# DEC/Intel DC21x4x (``Tulip'')
 device		em			# Intel PRO/1000 Gigabit Ethernet Family
-device		igb			# Intel PRO/1000 PCIE Server Gigabit Family
 device		ixgb			# Intel PRO/10GbE Ethernet Card
 device		le			# AMD Am7900 LANCE and Am79C9xx PCnet
 device		ti			# Alteon Networks Tigon I/II gigabit Ethernet
@@ -304,7 +304,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
@@ -340,7 +340,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
@@ -367,7 +366,7 @@ device		firmware		# firmware assist module
 device		bpf			# Berkeley packet filter
 
 # USB support
-#options 	USB_DEBUG		# enable debug msgs
+options 	USB_DEBUG		# enable debug msgs
 device		uhci			# UHCI PCI->USB interface
 device		ohci			# OHCI PCI->USB interface
 device		ehci			# EHCI PCI->USB interface (USB 2.0)
@@ -375,6 +374,7 @@ device		xhci			# XHCI PCI->USB interface (USB 3.0)
 device		usb			# USB Bus (required)
 device		ukbd			# Keyboard
 device		umass			# Disks/Mass storage - Requires scbus and da
+
 # USB Serial devices
 device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
 device		uark		# Technologies ARK3116 based serial adapters
@@ -437,7 +437,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
+# HyperV drivers and enhancement support
 device		hyperv			# HyperV drivers 
 
 # Xen HVM Guest Optimizations
@@ -453,6 +453,9 @@ device		crypto			# Required by IPSEC
 
 ### ELWIX Additional custom settings ...
 
+# Add multiple route table support
+options     ROUTETABLES=16
+
 #device		iscsi_initiator
 
 device		if_bridge
@@ -473,7 +476,7 @@ device		pfsync
 device		hifn
 device		enc
 device		cryptodev
-options		IPSEC_NAT_T
+options		TCP_SIGNATURE       #include support for RFC 2385
 
 options		ALTQ
 options		ALTQ_CBQ
@@ -599,7 +602,6 @@ options		VIMAGE
 #device		epair
 device		stf
 
-# NETMAP subsystem
 device		netmap
 
 device		rlswitch
@@ -611,4 +613,4 @@ options 	ACCEPT_FILTER_HTTP
 options 	SW_WATCHDOG
 
 device		etherswitch
-device		rtl8366rb
+#device		rtl8366rb