--- elwix/config/ELWIX_amd64	2017/02/13 16:52:46	1.2
+++ elwix/config/ELWIX_amd64	2017/06/08 13:13:56	1.2.2.1
@@ -1,4 +1,4 @@
-# $Id: ELWIX_amd64,v 1.2 2017/02/13 16:52:46 misho Exp $
+# $Id: ELWIX_amd64,v 1.2.2.1 2017/06/08 13:13:56 misho Exp $
 # $FreeBSD: head/sys/amd64/conf/GENERIC 271137 2014-09-04 21:06:33Z markj $
 
 cpu		HAMMER
@@ -11,7 +11,7 @@ hints		"ELWIX_amd64.hints"	# Default places to look fo
 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
@@ -88,13 +88,13 @@ options 	RCTL			# Resource limits
 options 	FLOWTABLE		# per-cpu routing cache
 
 # 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 	BUF_TRACKING		# Track buffer history
-#options 	DDB			# Support DDB.
+options 	DDB			# Support DDB.
 #options 	FULL_BUF_TRACKING	# Track more buffer history
-#options 	GDB			# Support remote GDB.
+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
@@ -152,7 +152,7 @@ device		isci			# Intel C600 SAS controller
 
 # ATA/SCSI peripherals
 device		scbus			# SCSI bus (required for ATA/SCSI)
-device		ch			# SCSI media changers
+#device		ch			# SCSI media changers
 device		da			# Direct Access (disks)
 device		sa			# Sequential Access (tape etc)
 device		cd			# CD
@@ -237,10 +237,10 @@ 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		ix			# Intel PRO/10GbE PCIE PF Ethernet
 device		ixv			# Intel PRO/10GbE PCIE VF Ethernet
 device		ixl			# Intel XL710 40Gbe PCIE Ethernet
+options		IXL_IW			# Enable iWARP Client Interface in ixl(4)
 device		ixlv			# Intel XL710 40Gbe VF PCIE Ethernet
 device		le			# AMD Am7900 LANCE and Am79C9xx PCnet
 device		ti			# Alteon Networks Tigon I/II gigabit Ethernet
@@ -356,7 +356,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)
@@ -427,7 +427,8 @@ 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
+options		HYPERV			# Hyper-V kernel infrastructure
 device		hyperv			# HyperV drivers 
 
 # Xen HVM Guest Optimizations
@@ -438,8 +439,26 @@ device		xenpci			# Xen HVM Hypervisor services driver
 # VMware support
 device		vmx			# VMware VMXNET3 Ethernet
 
+# Netmap provides direct access to TX/RX rings on supported NICs
+device		netmap			# netmap(4) support
+
+# The crypto framework is required by IPSEC
+device		crypto			# Required by IPSEC
+
 ### ELWIX Additional custom settings ...
 
+# Add multiple route table support
+options     ROUTETABLES=16
+
+device      cxgb    # Chelsio T3 10 Gigabit Ethernet adapter driver
+device	    cxgb_t3fw	# Chelsio T3 10 Gigabit Ethernet firmware
+device      cxgbe   # Chelsio T4 10Gb and 1Gb Ethernet adapter driver
+device      my      # Myson Technology Ethernet PCI driver
+device      mxge    # Myricom Myri10GE 10 Gigabit Ethernet adapter driver
+device      nxge    # Neterion Xframe 10GbE Server/Storage adapter driver
+device	    qlxge   # QLogic 8100 Series 10 Gigabit Ethernet
+device      oce     # Device driver for Emulex OneConnect 10Gb network adapters
+
 #device		iscsi_initiator
 
 device		if_bridge
@@ -459,9 +478,9 @@ device		pfsync
 
 device		hifn
 device		enc
-device		crypto
 device		cryptodev
 options		IPSEC_NAT_T
+options		TCP_SIGNATURE       #include support for RFC 2385
 
 options		ALTQ
 options		ALTQ_CBQ
@@ -579,9 +598,6 @@ device		wbwd
 options		VIMAGE
 #device		epair
 device		stf
-
-# NETMAP subsystem
-device		netmap
 
 device		rlswitch