cxgb3i: change cxgb3i to use libcxgbi

[PATCH v5 3/3] cxgb3i: change cxgb3i to use libcxgbi

From: Karen Xie <[email protected]>

Changed cxgb3i to make use of libcxgbi.

---

 drivers/scsi/Kconfig                 |    1 
 drivers/scsi/Makefile                |    2 
 drivers/scsi/cxgb3i/Kbuild           |    4 
 drivers/scsi/cxgb3i/Kconfig          |    7 
 drivers/scsi/cxgb3i/cxgb3i.h         |  161 ---
 drivers/scsi/cxgb3i/cxgb3i_ddp.c     |  773 --------------
 drivers/scsi/cxgb3i/cxgb3i_ddp.h     |  312 -----
 drivers/scsi/cxgb3i/cxgb3i_init.c    |  132 --
 drivers/scsi/cxgb3i/cxgb3i_iscsi.c   | 1018 ------------------
 drivers/scsi/cxgb3i/cxgb3i_offload.c | 1944 ----------------------------------
 drivers/scsi/cxgb3i/cxgb3i_offload.h |  243 ----
 drivers/scsi/cxgb3i/cxgb3i_pdu.c     |  495 ---------
 drivers/scsi/cxgb3i/cxgb3i_pdu.h     |   59 -
 drivers/scsi/cxgbi/Kconfig           |    1 
 drivers/scsi/cxgbi/Makefile          |    1 
 drivers/scsi/cxgbi/cxgb3i/Kbuild     |    3 
 drivers/scsi/cxgbi/cxgb3i/Kconfig    |    7 
 drivers/scsi/cxgbi/cxgb3i/cxgb3i.c   | 1432 +++++++++++++++++++++++++
 drivers/scsi/cxgbi/cxgb3i/cxgb3i.h   |   51 +
 19 files changed, 1496 insertions(+), 5150 deletions(-)
 delete mode 100644 drivers/scsi/cxgb3i/Kbuild
 delete mode 100644 drivers/scsi/cxgb3i/Kconfig
 delete mode 100644 drivers/scsi/cxgb3i/cxgb3i.h
 delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_ddp.c
 delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_ddp.h
 delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_init.c
 delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_iscsi.c
 delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_offload.c
 delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_offload.h
 delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_pdu.c
 delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_pdu.h
 create mode 100644 drivers/scsi/cxgbi/cxgb3i/Kbuild
 create mode 100644 drivers/scsi/cxgbi/cxgb3i/Kconfig
 create mode 100644 drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
 create mode 100644 drivers/scsi/cxgbi/cxgb3i/cxgb3i.h

index efe66bb..0c85653 100644
@@ -378,7 +378,6 @@ config ISCSI_BOOT_SYSFS
 	  via sysfs to userspace. If you wish to export this information,
 	  say Y. Otherwise, say N.
 
-source "drivers/scsi/cxgb3i/Kconfig"
 source "drivers/scsi/cxgbi/Kconfig"
 source "drivers/scsi/bnx2i/Kconfig"
 source "drivers/scsi/be2iscsi/Kconfig"

index cb31f8c..2e9a87e 100644
@@ -133,7 +133,7 @@ obj-$(CONFIG_SCSI_HPTIOP)	+= hptiop.o
 obj-$(CONFIG_SCSI_STEX)		+= stex.o
 obj-$(CONFIG_SCSI_MVSAS)	+= mvsas/
 obj-$(CONFIG_PS3_ROM)		+= ps3rom.o
-obj-$(CONFIG_SCSI_CXGB3_ISCSI)	+= libiscsi.o libiscsi_tcp.o cxgb3i/
+obj-$(CONFIG_SCSI_CXGB3_ISCSI)	+= libiscsi.o libiscsi_tcp.o cxgbi/
 obj-$(CONFIG_SCSI_CXGB4_ISCSI)	+= libiscsi.o libiscsi_tcp.o cxgbi/
 obj-$(CONFIG_SCSI_BNX2_ISCSI)	+= libiscsi.o bnx2i/
 obj-$(CONFIG_BE2ISCSI)		+= libiscsi.o be2iscsi/

deleted file mode 100644
index 70d060b..0000000
@@ -1,4 +0,0 @@
-EXTRA_CFLAGS += -I$(srctree)/drivers/net/cxgb3
-
-cxgb3i-y := cxgb3i_init.o cxgb3i_iscsi.o cxgb3i_pdu.o cxgb3i_offload.o cxgb3i_ddp.o
-obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o

deleted file mode 100644
index bfdcaf5..0000000
@@ -1,7 +0,0 @@
-config SCSI_CXGB3_ISCSI
-	tristate "Chelsio S3xx iSCSI support"
-	depends on CHELSIO_T3_DEPENDS
-	select CHELSIO_T3
-	select SCSI_ISCSI_ATTRS
-	---help---
-	This driver supports iSCSI offload for the Chelsio S3 series devices.

index a470e38..17eb5d5 100644

index 9e8f604..86007e3 100644

new file mode 100644
index 0000000..09dbf9e

new file mode 100644
index 0000000..5cf4e98

You received this message because you are subscribed to the Google Groups "open-iscsi" group.
To post to this group, send email to open-iscsi-/JYPxA39Uh5TLH3MbocFF+G/[email protected]
To unsubscribe from this group, send email to open-iscsi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected]
For more options, visit this group at http://groups.google.com/group/open-iscsi?hl=en.

Part of the diff is not shown here. View the raw message.