>From 17b0c5412e085e1f288c05cb667ec36e4a05c59b Mon Sep 17 00:00:00 2001 From: Vu Pham <vu@xxxxxxxxxxxxxxxxx> Date: Mon, 16 Aug 2010 14:48:01 -0700 Subject: [PATCH 10/10] mlx4_fc: Enable FC over Ethernet/Infiniband drivers Add entries in scsi's Kconfig and Makefile to enable mlx4_fc (fcoe/fcoib offload driver) and mlx4_fcoib (FIP-alike discovery driver) Signed-off-by: Vu Pham <vu@xxxxxxxxxxxx> --- drivers/scsi/Kconfig | 22 ++++++++++++++++++++++ drivers/scsi/Makefile | 2 ++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 158284f..3573cee 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -687,6 +687,28 @@ config FCOE_FNIC <file:Documentation/scsi/scsi.txt>. The module will be called fnic. +config MLX4_FC + tristate "Mellanox FC module" + depends on MLX4_EN + select LIBFC + select LIBFCOE + help + Fibre Channel over Ethernet/Infiniband module + + This is support for the Mellanox ConnectX/ConnectX-2 HCAs + The module will be called mlx4_fc + +config MLX4_FCOIB + tristate "Mellanox FCoIB discovery module" + depends on INFINIBAND + select MLX4_FC + help + Fibre Channel over Infiniband discovery module + + The module FIP-alike to discover BridgeX gateways in the + Infiniband fabric + The module will be called mlx4_fc + config SCSI_DMX3191D tristate "DMX3191D SCSI support" depends on PCI && SCSI diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index 2a3fca2..0d0dab7 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile @@ -40,6 +40,8 @@ obj-$(CONFIG_LIBFC) += libfc/ obj-$(CONFIG_LIBFCOE) += fcoe/ obj-$(CONFIG_FCOE) += fcoe/ obj-$(CONFIG_FCOE_FNIC) += fnic/ +obj-$(CONFIG_MLX4_FC) += mlx4_fc/ +obj-$(CONFIG_MLX4_FCOIB) += mlx4_fc/ obj-$(CONFIG_ISCSI_TCP) += libiscsi.o libiscsi_tcp.o iscsi_tcp.o obj-$(CONFIG_INFINIBAND_ISER) += libiscsi.o obj-$(CONFIG_SCSI_A4000T) += 53c700.o a4000t.o -- 1.6.3.3
