From 2f3236e013aa1af4540bc7d8c83014fc4e115379 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Wed, 8 Oct 2008 13:44:27 +0000 Subject: [PATCH] Until now the kernel config option to enable the SRP target was called CONFIG_INFINIBAND_SRPT. This is a reminiscent from the time when the SRPT code resided in the directory drivers/infiniband/ulp/srpt. Since this code has been moved into the directory drivers/scst/srpt, the path below renames this config option into CONFIG_SCST_SRPT. The other changes present in this patch are: - Removed srpt/src/Makefile.infiniband.Linux-2.6.2[45].patch since these files are obsolete. - Rewrote Kconfig help text slightly. The patch below has been tested by verifying that the 2.6.26.5 kernel + SCST patch still compiles cleanly with CONFIG_SCST_SRPT=m. Signed-off-by: Bart Van Assche git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@518 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- srpt/src/Kconfig | 18 +++++++++--------- srpt/src/Makefile.in_kernel | 2 +- .../src/Makefile.infiniband.Linux-2.6.24.patch | 9 --------- .../src/Makefile.infiniband.Linux-2.6.25.patch | 9 --------- 4 files changed, 10 insertions(+), 28 deletions(-) diff --git a/srpt/src/Kconfig b/srpt/src/Kconfig index 7d4c3603b..58de81474 100644 --- a/srpt/src/Kconfig +++ b/srpt/src/Kconfig @@ -1,12 +1,12 @@ -config INFINIBAND_SRPT - tristate "InfiniBand SCSI RDMA Protocol Target Mode" +config SCST_SRPT + tristate "InfiniBand SCSI RDMA Protocol target support" depends on INFINIBAND && SCST ---help--- - Support for the SCSI RDMA Protocol Target mode over - InfiniBand. This allows you to turn a standard Linux box to - native Infiniband storage using SRP protocol. The SRP protocol - is defined by the INCITS T10 technical committee. See - . - - You will also need the SCST framework enabled. + Support for the SCSI RDMA Protocol (SRP) Target driver. The + SRP protocol is a protocol that allows an initiator to access + a block storage device on another host (target) over a network + that supports the RDMA protocol. Currently the RDMA protocol is + supported by InfiniBand and by iWarp network hardware. More + information about the SRP protocol can be found on the website + of the INCITS T10 technical committee (http://www.t10.org/). diff --git a/srpt/src/Makefile.in_kernel b/srpt/src/Makefile.in_kernel index 6b31a3723..170c4b4b9 100644 --- a/srpt/src/Makefile.in_kernel +++ b/srpt/src/Makefile.in_kernel @@ -1,4 +1,4 @@ EXTRA_CFLAGS += -Idrivers/infiniband/include EXTRA_CFLAGS += -Iinclude/scst -obj-$(CONFIG_INFINIBAND_SRPT) += ib_srpt.o +obj-$(CONFIG_SCST_SRPT) += ib_srpt.o diff --git a/srpt/src/Makefile.infiniband.Linux-2.6.24.patch b/srpt/src/Makefile.infiniband.Linux-2.6.24.patch index 909251197..e69de29bb 100644 --- a/srpt/src/Makefile.infiniband.Linux-2.6.24.patch +++ b/srpt/src/Makefile.infiniband.Linux-2.6.24.patch @@ -1,9 +0,0 @@ -diff -uprN orig/linux-2.6.24/drivers/infiniband/Makefile linux-2.6.24/drivers/infiniband/Makefile ---- orig/linux-2.6.24/drivers/infiniband/Makefile 2008-01-24 23:58:37.000000000 +0100 -+++ linux-2.6.24/drivers/infiniband/Makefile 2008-05-09 13:57:00.000000000 +0200 -@@ -7,4 +7,5 @@ - obj-$(CONFIG_MLX4_INFINIBAND) += hw/mlx4/ - obj-$(CONFIG_INFINIBAND_IPOIB) += ulp/ipoib/ - obj-$(CONFIG_INFINIBAND_SRP) += ulp/srp/ -+obj-$(CONFIG_INFINIBAND_SRPT) += ulp/srpt/ - obj-$(CONFIG_INFINIBAND_ISER) += ulp/iser/ diff --git a/srpt/src/Makefile.infiniband.Linux-2.6.25.patch b/srpt/src/Makefile.infiniband.Linux-2.6.25.patch index 71f7ccf77..e69de29bb 100644 --- a/srpt/src/Makefile.infiniband.Linux-2.6.25.patch +++ b/srpt/src/Makefile.infiniband.Linux-2.6.25.patch @@ -1,9 +0,0 @@ -diff -uprN orig/linux-2.6.24/drivers/infiniband/Makefile linux-2.6.24/drivers/infiniband/Makefile ---- orig/linux-2.6.24/drivers/infiniband/Makefile 2008-01-24 23:58:37.000000000 +0100 -+++ linux-2.6.24/drivers/infiniband/Makefile 2008-05-09 13:57:00.000000000 +0200 -@@ -8,4 +8,5 @@ - obj-$(CONFIG_INFINIBAND_NES) += hw/nes/ - obj-$(CONFIG_INFINIBAND_IPOIB) += ulp/ipoib/ - obj-$(CONFIG_INFINIBAND_SRP) += ulp/srp/ -+obj-$(CONFIG_INFINIBAND_SRPT) += ulp/srpt/ - obj-$(CONFIG_INFINIBAND_ISER) += ulp/iser/