From: root <root@rac1.ogc.int>
Date: Mon, 2 Mar 2015 19:59:05 +0000 (-0600)
Subject: Remove cxgbi drivers
X-Git-Tag: vofed-3.18~33
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=cdabc7326e5d4603192798a3ce00bad96aafb000;p=~emulex%2Ftmp%2Fcompat-rdma%2F.git

Remove cxgbi drivers

Not supported by Chelsio within OFED.

Signed-off-by: Steve Wise <swise@opengridcomputing.com>
---

diff --git a/Makefile b/Makefile
index a0559be..a318a5b 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,4 @@ obj-$(CONFIG_MLX5_CORE)         += drivers/net/ethernet/mellanox/mlx5/core/
 obj-$(CONFIG_BE2NET)            += drivers/net/ethernet/emulex/benet/
 obj-$(CONFIG_RDS)               += net/rds/
 obj-$(CONFIG_SUNRPC_XPRT_RDMA)  += net/sunrpc/xprtrdma/
-obj-$(CONFIG_SCSI_CXGB3_ISCSI)  += drivers/scsi/cxgbi/
-obj-$(CONFIG_SCSI_CXGB4_ISCSI)  += drivers/scsi/cxgbi/
 obj-$(CONFIG_SCSI_SRP_ATTRS)    += drivers/scsi/
diff --git a/configure b/configure
index 745b941..295a5ee 100755
--- a/configure
+++ b/configure
@@ -160,18 +160,12 @@ Usage:  `basename $0` [options]
     --with-cxgb3-mod    make CONFIG_INFINIBAND_CXGB3=m [no]
     --without-cxgb3-mod    [yes]
 
-    --with-cxgb3i-mod    make CONFIG_SCSI_CXGB3_ISCSI=m [no]
-    --without-cxgb3i-mod    [yes]
-
     --with-cxgb3_debug-mod    make CONFIG_INFINIBAND_CXGB3_DEBUG=y [no]
     --without-cxgb3_debug-mod    [yes]
 
     --with-cxgb4-mod    make CONFIG_INFINIBAND_CXGB4=m [no]
     --without-cxgb4-mod    [yes]
 
-    --with-cxgb4i-mod    make CONFIG_SCSI_CXGB4_ISCSI=m [no]
-    --without-cxgb4i-mod    [yes]
-
     --with-nes-mod    make CONFIG_INFINIBAND_NES=m [no]
     --without-nes-mod    [yes]
 
diff --git a/ofed_scripts/openibd b/ofed_scripts/openibd
index fd01cc5..e09ef65 100644
--- a/ofed_scripts/openibd
+++ b/ofed_scripts/openibd
@@ -268,7 +268,7 @@ fi
 
 GEN1_UNLOAD_MODULES="ib_srp_target scsi_target ib_srp kdapltest_module ib_kdapl ib_sdp ib_useraccess ib_useraccess_cm ib_cm ib_dapl_srv ib_ip2pr ib_ipoib ib_tavor mod_thh mod_rhh ib_dm_client ib_sa_client ib_client_query ib_poll ib_mad ib_core ib_services"
 
-UNLOAD_MODULES="ib_mthca mlx5_ib mlx5_core mlx4_ib ib_ipath ipath_core ib_ehca iw_nes cxgb3i iw_cxgb3 cxgb3 iw_cxgb4 cxgb4 ocrdma"
+UNLOAD_MODULES="ib_mthca mlx5_ib mlx5_core mlx4_ib ib_ipath ipath_core ib_ehca iw_nes iw_cxgb3 cxgb3 iw_cxgb4 cxgb4 ocrdma"
 UNLOAD_MODULES="$UNLOAD_MODULES ib_qib"
 UNLOAD_MODULES="$UNLOAD_MODULES ib_ipoib ib_madeye ib_rds"
 UNLOAD_MODULES="$UNLOAD_MODULES rds_rdma rds_tcp rds ib_ucm kdapl ib_srp_target scsi_target ib_srpt ib_srp ib_iser ib_sdp"