[openib-general] fix iSER description and selections in Kconfig

[Erez Zilber]

Roland Dreier wrote:
> There is definitely a bug in the drivers/infiniband/ulp/iser/Kconfig
> file.  ISER only depends on INFINIBAND && SCSI.  However it is easily
> possible to enable INFINIBAND and SCSI without enabling INET (in fact
> they can be enabled without NET as in the original config in this thread).
>
> iser does select SCSI_ISCSI_ATTRS, but without selecting NET that it
> depends on, so this alone will result in a broken config.  However
> nothing will enable INET (which I think you said iser depends on).  So
> something like the below is required, I think.  Although it would
> probably be better to make iser depend on INET (as ISCSI_TCP does)
> rather than selecting NET and INET.
>
> Toralf, can you confirm that applying this patch and doing make
> oldconfig and make with your original config works OK?
>
> Thanks,
>   Roland
>
> diff --git a/drivers/infiniband/ulp/iser/Kconfig b/drivers/infiniband/ulp/iser/Kconfig
> index fead87d..a122bb4 100644
> --- a/drivers/infiniband/ulp/iser/Kconfig
> +++ b/drivers/infiniband/ulp/iser/Kconfig
> @@ -1,6 +1,8 @@
>  config INFINIBAND_ISER
>  	tristate "ISCSI RDMA Protocol"
>  	depends on INFINIBAND && SCSI
> +	select NET
> +	select INET
>  	select SCSI_ISCSI_ATTRS
>  	---help---
>  	  Support for the ISCSI RDMA Protocol over InfiniBand.  This
>   
Roland,

I think that the patch below covers all cases. It depends on the patch 
that Or sent this morning for the config entry of the CMA.

fix the description of iSER in Kconfig. It is not accurate.
Also, iSER used the CMA and INET. It depends on SCSI_ISCSI_ATTRS
that depends on NET. Selecting NET, INET & INFINIBAND_RDMA_CM
ensures that the config won't break.

Signed-off-by: Erez Zilber <erezz at voltaire.com>

---

 drivers/infiniband/ulp/iser/Kconfig |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

3dc4e3bf0716d502a6fd7e62806c4932e8978e6b
diff --git a/drivers/infiniband/ulp/iser/Kconfig 
b/drivers/infiniband/ulp/iser/Kconfig
index fead87d..c251855 100644
--- a/drivers/infiniband/ulp/iser/Kconfig
+++ b/drivers/infiniband/ulp/iser/Kconfig
@@ -1,11 +1,14 @@
 config INFINIBAND_ISER
-       tristate "ISCSI RDMA Protocol"
+       tristate "iSCSI Extensions for RDMA (iSER)"
        depends on INFINIBAND && SCSI
+       select NET
+       select INET
+       select INFINIBAND_RDMA_CM
        select SCSI_ISCSI_ATTRS
        ---help---
-         Support for the ISCSI RDMA Protocol over InfiniBand.  This
-         allows you to access storage devices that speak ISER/ISCSI
+         Support for the iSCSI Extensions for RDMA (iSER) Protocol over 
InfiniBand. This
+         allows you to access storage devices that speak iSCSI over iSER
          over InfiniBand.

          The ISER protocol is defined by IETF.
-         See <http://www.ietf.org/>.
+         See 
<http://www.ietf.org/internet-drafts/draft-ietf-ips-iser-05.txt>.
--
1.2.6