From: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Thu, 21 Sep 2023 22:54:35 +0000 (-0500)
Subject: scsi: ibmvfc: Add protocol field to target structure
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=02e2d8f4c2f4c4632c4040a7db58977a9815401c;p=linux.git

scsi: ibmvfc: Add protocol field to target structure

Add a per target protocol field so target code can determine correct
protocol specific actions as well as identify the correct channel group
target list.

Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
Link: https://lore.kernel.org/r/20230921225435.3537728-12-tyreld@linux.ibm.com
Reviewed-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h
index ab3a7070171b8..331ecf8254be7 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.h
+++ b/drivers/scsi/ibmvscsi/ibmvfc.h
@@ -716,9 +716,15 @@ enum ibmvfc_target_action {
 	IBMVFC_TGT_ACTION_LOGOUT_DELETED_RPORT,
 };
 
+enum ibmvfc_protocol {
+	IBMVFC_PROTO_SCSI = 0,
+	IBMVFC_PROTO_NVME = 1,
+};
+
 struct ibmvfc_target {
 	struct list_head queue;
 	struct ibmvfc_host *vhost;
+	enum ibmvfc_protocol protocol;
 	u64 scsi_id;
 	u64 wwpn;
 	u64 new_scsi_id;
@@ -816,11 +822,6 @@ struct ibmvfc_queue {
 	irq_handler_t handler;
 };
 
-enum ibmvfc_protocol {
-	IBMVFC_PROTO_SCSI = 0,
-	IBMVFC_PROTO_NVME = 1,
-};
-
 struct ibmvfc_channels {
 	struct ibmvfc_queue *scrqs;
 	enum ibmvfc_protocol protocol;