]> git.karo-electronics.de Git - mv-sheeva.git/commit
iscsi: Resolve iscsi_proto.h naming conflicts with drivers/target/iscsi
authorNicholas Bellinger <nab@linux-iscsi.org>
Fri, 27 May 2011 11:16:33 +0000 (11:16 +0000)
committerNicholas Bellinger <nab@linux-iscsi.org>
Mon, 25 Jul 2011 07:18:45 +0000 (07:18 +0000)
commit123521830c0ea35055b900d2ff0b73bb129e08cb
treee0f2a4b46d6b7759a17b91f4953627b51ce20d5a
parentbbd9d6f7fbb0305c9a592bf05a32e87eb364a4ff
iscsi: Resolve iscsi_proto.h naming conflicts with drivers/target/iscsi

This patch renames the following iscsi_proto.h structures to avoid
namespace issues with drivers/target/iscsi/iscsi_target_core.h:

*) struct iscsi_cmd -> struct iscsi_scsi_req
*) struct iscsi_cmd_rsp -> struct iscsi_scsi_rsp
*) struct iscsi_login -> struct iscsi_login_req

This patch includes useful ISCSI_FLAG_LOGIN_[CURRENT,NEXT]_STAGE*,
and ISCSI_FLAG_SNACK_TYPE_* definitions used by iscsi_target_mod, and
fixes the incorrect definition of struct iscsi_snack to following
RFC-3720 Section 10.16. SNACK Request.

Also, this patch updates libiscsi, iSER, be2iscsi, and bn2xi to
use the updated structure definitions in a handful of locations.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
drivers/infiniband/ulp/iser/iser_initiator.c
drivers/scsi/be2iscsi/be_main.h
drivers/scsi/bnx2i/bnx2i_hwi.c
drivers/scsi/bnx2i/bnx2i_iscsi.c
drivers/scsi/libiscsi.c
include/scsi/iscsi_proto.h