--- elwix/config/ELWIX_amd64	2017/08/22 14:36:56	1.2.2.3
+++ elwix/config/ELWIX_amd64	2018/07/06 00:23:20	1.2.2.4
@@ -1,4 +1,4 @@
-# $Id: ELWIX_amd64,v 1.2.2.3 2017/08/22 14:36:56 misho Exp $
+# $Id: ELWIX_amd64,v 1.2.2.4 2018/07/06 00:23:20 misho Exp $
 # $FreeBSD: head/sys/amd64/conf/GENERIC 271137 2014-09-04 21:06:33Z markj $
 
 cpu		HAMMER
@@ -15,11 +15,15 @@ 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_OFFLOAD		# TCP offload
+options 	TCP_BLACKBOX		# Enhanced TCP event logging
 options 	TCP_HHOOK		# hhook(9) framework for TCP
+options		TCP_RFC7413		# TCP Fast Open
 options 	SCTP			# Stream Control Transmission Protocol
 options 	FFS			# Berkeley Fast Filesystem
 options 	SOFTUPDATES		# Enable FFS soft updates support
@@ -103,7 +107,6 @@ options 	GDB			# Support remote GDB.
 
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel
-options 	DEVICE_NUMA		# I/O Device Affinity
 options 	EARLY_AP_STARTUP
 
 # CPU frequency control
@@ -127,11 +130,7 @@ 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
-					# output.  Adds ~128k to driver.
 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
 device		isp			# Qlogic family
@@ -148,6 +147,7 @@ device		adw			# Advansys wide SCSI adapters
 device		aic			# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
 device		bt			# Buslogic/Mylex MultiMaster SCSI adapters
 device		isci			# Intel C600 SAS controller
+device		ocs_fc			# Emulex FC adapters
 
 # ATA/SCSI peripherals
 device		scbus			# SCSI bus (required for ATA/SCSI)
@@ -385,13 +385,13 @@ device		ucom
 device		umcs
 
 # FireWire support
-device		firewire	# FireWire bus code
-# sbp(4) works for some systems but causes boot failure on others
-#device		sbp		# SCSI over FireWire (Requires scbus and da)
-device		fwe		# Ethernet over FireWire (non-standard!)
-device		fwip		# IP over FireWire (RFC 2734,3146)
-device		dcons		# Dumb console driver
-device		dcons_crom	# Configuration ROM for dcons
+#device		firewire	# FireWire bus code
+## sbp(4) works for some systems but causes boot failure on others
+##device		sbp		# SCSI over FireWire (Requires scbus and da)
+#device		fwe		# Ethernet over FireWire (non-standard!)
+#device		fwip		# IP over FireWire (RFC 2734,3146)
+#device		dcons		# Dumb console driver
+#device		dcons_crom	# Configuration ROM for dcons
 
 # Sound support
 device		sound			# Generic sound driver (required)
@@ -436,7 +436,7 @@ device		crypto			# Required by IPSEC
 ### ELWIX Additional custom settings ...
 
 # Add multiple route table support
-options     ROUTETABLES=16
+#options     ROUTETABLES=16
 
 device      cxgb    # Chelsio T3 10 Gigabit Ethernet adapter driver
 device	    cxgb_t3fw	# Chelsio T3 10 Gigabit Ethernet firmware
@@ -455,7 +455,7 @@ device		gre
 device		lagg
 device		carp
 
-device		siba_bwn
+#device		siba_bwn
 
 #options		NDISAPI
 #device		ndis
@@ -582,7 +582,6 @@ device		wbwd
 
 #device		disc
 #device		edsc
-options		VIMAGE
 #device		epair
 device		stf