summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2015-12-16 13:14:09 -0800
committerLaura Abbott <labbott@fedoraproject.org>2015-12-16 13:14:09 -0800
commitb3a35e1ec0af5aab433344380fd8e60403d202a3 (patch)
tree2d627d1bfb59d9d6234baf28133f6cab1f15c9bd /config-generic
parentaea789450a25987afb9b634414a6eb967f7c67ca (diff)
downloadkernel-b3a35e1ec0af5aab433344380fd8e60403d202a3.tar.gz
kernel-b3a35e1ec0af5aab433344380fd8e60403d202a3.tar.xz
kernel-b3a35e1ec0af5aab433344380fd8e60403d202a3.zip
Enable a set of RDMA drivers (rhbz 1291902)
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic16
1 files changed, 10 insertions, 6 deletions
diff --git a/config-generic b/config-generic
index e1e17b0b1..4067365ab 100644
--- a/config-generic
+++ b/config-generic
@@ -195,8 +195,8 @@ CONFIG_INFINIBAND_NES=m
# CONFIG_INFINIBAND_NES_DEBUG is not set
CONFIG_INFINIBAND_QIB=m
CONFIG_INFINIBAND_QIB_DCA=y
-# CONFIG_INFINIBAND_OCRDMA is not set
-# CONFIG_INFINIBAND_USNIC is not set
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_USNIC=m
#
# Executable file formats
@@ -1433,7 +1433,8 @@ CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T3=m
CONFIG_CHELSIO_T4=m
CONFIG_CHELSIO_T4VF=m
-# CONFIG_CHELSIO_T4_DCB is not set
+CONFIG_CHELSIO_T4_DCB=y
+CONFIG_CHELSIO_T4_FCOE=y
CONFIG_NET_VENDOR_CISCO=y
CONFIG_ENIC=m
@@ -1684,9 +1685,12 @@ CONFIG_JME=m
#
# CONFIG_IP1000 is not set
-# CONFIG_MLX4_EN is not set
-# CONFIG_MLX4_EN_VXLAN is not set
-# CONFIG_MLX5_CORE is not set
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_EN_VXLAN=y
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_CORE_EN=y
# CONFIG_MLXSW_CORE is not set
# CONFIG_SFC is not set