Deprecate kernel configuration option EM_MULTIQUEUE now that the em(4)

driver conforms to iflib.

6 files changed, 7 insertions, 16 deletions

diff --git a/UPDATING b/UPDATING
index d604e42894319..107fd8b1782e0 100644
--- a/UPDATING
+++ b/UPDATING
@@ -51,6 +51,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 ****************************** SPECIAL WARNING: ******************************
 
+20170112:
+	The EM_MULTIQUEUE kernel configuration option is deprecated now that
+	the em(4) driver conforms to iflib specifications.
+
 20170109:
 	The igb(4), em(4) and lem(4) ethernet drivers are now implemented via
 	IFLIB.  If you have a custom kernel configuration that excludes em(4)
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 711c9a88de4a0..2e430bc129da1 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -3055,9 +3055,6 @@ options 	RANDOM_ENABLE_UMA	# slab allocator
 # Module to enable execution of application via emulators like QEMU
 options         IMAGACT_BINMISC
 
-# Intel em(4) driver
-options		EM_MULTIQUEUE # Activate multiqueue features/disable MSI-X
-
 # zlib I/O stream support
 # This enables support for compressed core dumps.
 options 	GZIO
diff --git a/sys/conf/files b/sys/conf/files
index c221bbec85bfa..d8e76b1a3baec 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -2139,6 +2139,8 @@ dev/ixgbe/ix_txrx.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_osdep.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
+dev/ixgbe/ixgbe_sysctl.c       optional ix inet | ixv inet \
+	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_phy.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_api.c		optional ix inet | ixv inet \
diff --git a/sys/conf/options b/sys/conf/options
index 17923ea628b93..dee1eaddbb0d6 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -986,9 +986,6 @@ RANDOM_LOADABLE	opt_global.h
 # the uma slab allocator.
 RANDOM_ENABLE_UMA	opt_global.h
 
-# Intel em(4) driver
-EM_MULTIQUEUE	opt_em.h
-
 # BHND(4) driver
 BHND_LOGLEVEL	opt_global.h
 
diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h
index 635d172bf4580..d7290fd724554 100644
--- a/sys/dev/e1000/if_em.h
+++ b/sys/dev/e1000/if_em.h
@@ -25,7 +25,6 @@
  */
 
 /*$FreeBSD$*/
-#include "opt_em.h"
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -176,11 +175,7 @@
  *            restoring the network connection. To eliminate the potential
  *            for the hang ensure that EM_RDTR is set to 0.
  */
-#ifdef EM_MULTIQUEUE
-#define EM_RDTR                         64
-#else
 #define EM_RDTR                         0
-#endif
 
 /*
  * Receive Interrupt Absolute Delay Timer (Not valid for 82542/82543/82544)
@@ -193,11 +188,7 @@
  *   along with EM_RDTR, may improve traffic throughput in specific network
  *   conditions.
  */
-#ifdef EM_MULTIQUEUE
-#define EM_RADV                         128
-#else
 #define EM_RADV                         64
-#endif
 
 /*
  * This parameter controls whether or not autonegotation is enabled.
diff --git a/sys/modules/em/Makefile b/sys/modules/em/Makefile
index ead1329780522..18f16756bfa58 100644
--- a/sys/modules/em/Makefile
+++ b/sys/modules/em/Makefile
@@ -3,7 +3,7 @@
 
 .PATH:  ${.CURDIR}/../../dev/e1000
 KMOD    = if_em
-SRCS    = device_if.h bus_if.h pci_if.h opt_ddb.h opt_em.h opt_inet.h \
+SRCS    = device_if.h bus_if.h pci_if.h opt_ddb.h opt_inet.h \
 	  opt_inet6.h ifdi_if.h
 SRCS    += $(CORE_SRC) $(LEGACY_SRC)
 SRCS	+= $(COMMON_SHARED) $(LEGACY_SHARED) $(PCIE_SHARED)