summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/Kconfig
diff options
context:
space:
mode:
authorJames Bottomley <jejb@titanic.(none)>2005-09-08 16:37:35 +0200
committerJames Bottomley <jejb@titanic.(none)>2005-09-08 16:37:35 +0200
commitf5c7f03113fc9c547012cf403aec4b534d575ef0 (patch)
tree255bd4ff0c5a9314be427cf0695349ac432f9d7c /drivers/scsi/Kconfig
parent[SCSI] Re-do "final klist fixes" (diff)
parentMerge ../linux-2.6 (diff)
downloadlinux-f5c7f03113fc9c547012cf403aec4b534d575ef0.tar.xz
linux-f5c7f03113fc9c547012cf403aec4b534d575ef0.zip
Merge HEAD from ../scsi-iscsi-2.6
Diffstat (limited to 'drivers/scsi/Kconfig')
-rw-r--r--drivers/scsi/Kconfig25
1 files changed, 24 insertions, 1 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 2d21265e650b..1c60c568e911 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -229,12 +229,35 @@ config SCSI_FC_ATTRS
config SCSI_ISCSI_ATTRS
tristate "iSCSI Transport Attributes"
- depends on SCSI
+ depends on SCSI && NET
help
If you wish to export transport-specific information about
each attached iSCSI device to sysfs, say Y.
Otherwise, say N.
+config ISCSI_TCP
+ tristate "iSCSI Initiator over TCP/IP"
+ depends on SCSI && INET && SCSI_ISCSI_ATTRS
+ select CRYPTO
+ select CRYPTO_MD5
+ select CRYPTO_CRC32C
+ help
+ The iSCSI Driver provides a host with the ability to access storage
+ through an IP network. The driver uses the iSCSI protocol to transport
+ SCSI requests and responses over a TCP/IP network between the host
+ (the "initiator") and "targets". Architecturally, the iSCSI driver
+ combines with the host's TCP/IP stack, network drivers, and Network
+ Interface Card (NIC) to provide the same functions as a SCSI or a
+ Fibre Channel (FC) adapter driver with a Host Bus Adapter (HBA).
+
+ To compile this driver as a module, choose M here: the
+ module will be called iscsi_tcp.
+
+ The userspace component needed to initialize the driver, documentation,
+ and sample configuration files can be found here:
+
+ http://linux-iscsi.sf.net
+
endmenu
menu "SCSI low-level drivers"