Author: sbruno
Date: Thu Jan 12 14:38:18 2017
New Revision: 311980
URL: https://svnweb.freebsd.org/changeset/base/311980
Log:
Deprecate kernel configuration option EM_MULTIQUEUE now that the em(4)
driver conforms to iflib.
Modified:
head/UPDATING
head/sys/conf/NOTES
head/sys/conf/files
head/sys/conf/options
head/sys/dev/e1000/if_em.h
head/sys/modules/em/Makefile
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Thu Jan 12 14:28:32 2017 (r311979)
+++ head/UPDATING Thu Jan 12 14:38:18 2017 (r311980)
@@ -51,6 +51,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12
****************************** 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)
Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES Thu Jan 12 14:28:32 2017 (r311979)
+++ head/sys/conf/NOTES Thu Jan 12 14:38:18 2017 (r311980)
@@ -3055,9 +3055,6 @@ options RANDOM_ENABLE_UMA # slab alloca
# 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
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Thu Jan 12 14:28:32 2017 (r311979)
+++ head/sys/conf/files Thu Jan 12 14:38:18 2017 (r311980)
@@ -2139,6 +2139,8 @@ dev/ixgbe/ix_txrx.c optional ix 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 \
Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options Thu Jan 12 14:28:32 2017 (r311979)
+++ head/sys/conf/options Thu Jan 12 14:38:18 2017 (r311980)
@@ -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
Modified: head/sys/dev/e1000/if_em.h
==============================================================================
--- head/sys/dev/e1000/if_em.h Thu Jan 12 14:28:32 2017 (r311979)
+++ head/sys/dev/e1000/if_em.h Thu Jan 12 14:38:18 2017 (r311980)
@@ -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.
Modified: head/sys/modules/em/Makefile
==============================================================================
--- head/sys/modules/em/Makefile Thu Jan 12 14:28:32 2017
(r311979)
+++ head/sys/modules/em/Makefile Thu Jan 12 14:38:18 2017
(r311980)
@@ -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)
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
