|
 |
3c6e85 |
From 0b10b1ce904dad6ce4f799be14a85da1383628db Mon Sep 17 00:00:00 2001
|
|
|
3c6e85 |
From: Himanshu Madhani <hmadhani@redhat.com>
|
|
|
3c6e85 |
Date: Thu, 21 Nov 2019 16:36:46 -0500
|
|
|
3c6e85 |
Subject: [PATCH 136/155] [scsi] scsi: qla2xxx: Use tabs instead of spaces for
|
|
|
3c6e85 |
indentation
|
|
|
3c6e85 |
|
|
|
3c6e85 |
Message-id: <20191121163701.43688-12-hmadhani@redhat.com>
|
|
|
3c6e85 |
Patchwork-id: 287861
|
|
|
3c6e85 |
O-Subject: [RHLE 7.8 e-stor PATCH v3 11/26] scsi: qla2xxx: Use tabs instead of spaces for indentation
|
|
|
3c6e85 |
Bugzilla: 1731581
|
|
|
3c6e85 |
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
|
3c6e85 |
RH-Acked-by: Ewan Milne <emilne@redhat.com>
|
|
|
3c6e85 |
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
3c6e85 |
|
|
|
3c6e85 |
From: Bart Van Assche <bvanassche@acm.org>
|
|
|
3c6e85 |
|
|
|
3c6e85 |
Bugzilla 1731581
|
|
|
3c6e85 |
|
|
|
3c6e85 |
This patch only modifies whitespace.
|
|
|
3c6e85 |
|
|
|
3c6e85 |
Cc: Himanshu Madhani <hmadhani@marvell.com>
|
|
|
3c6e85 |
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
|
|
|
3c6e85 |
Tested-by: Himanshu Madhani <hmadhani@marvell.com>
|
|
|
3c6e85 |
Reviewed-by: Himanshu Madhani <hmadhani@marvell.com>
|
|
|
3c6e85 |
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
|
3c6e85 |
(cherry picked from commit 0184793df2e860534380a66aa76b8807e71188c2)
|
|
|
3c6e85 |
Signed-off-by: Himanshu Madhani <hmadhani@redhat.com>
|
|
|
3c6e85 |
Signed-off-by: Jan Stancek <jstancek@redhat.com>
|
|
|
3c6e85 |
---
|
|
|
3c6e85 |
drivers/scsi/qla2xxx/qla_gs.c | 78 +++++++++++++++++++++----------------------
|
|
|
3c6e85 |
1 file changed, 39 insertions(+), 39 deletions(-)
|
|
|
3c6e85 |
|
|
|
3c6e85 |
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
|
|
|
3c6e85 |
index 23976623af7b..ed92645e2f03 100644
|
|
|
3c6e85 |
--- a/drivers/scsi/qla2xxx/qla_gs.c
|
|
|
3c6e85 |
+++ b/drivers/scsi/qla2xxx/qla_gs.c
|
|
|
3c6e85 |
@@ -3476,54 +3476,54 @@ done:
|
|
|
3c6e85 |
|
|
|
3c6e85 |
void qla24xx_handle_gffid_event(scsi_qla_host_t *vha, struct event_arg *ea)
|
|
|
3c6e85 |
{
|
|
|
3c6e85 |
- fc_port_t *fcport = ea->fcport;
|
|
|
3c6e85 |
+ fc_port_t *fcport = ea->fcport;
|
|
|
3c6e85 |
|
|
|
3c6e85 |
- qla24xx_post_gnl_work(vha, fcport);
|
|
|
3c6e85 |
+ qla24xx_post_gnl_work(vha, fcport);
|
|
|
3c6e85 |
}
|
|
|
3c6e85 |
|
|
|
3c6e85 |
void qla24xx_async_gffid_sp_done(void *s, int res)
|
|
|
3c6e85 |
{
|
|
|
3c6e85 |
- struct srb *sp = s;
|
|
|
3c6e85 |
- struct scsi_qla_host *vha = sp->vha;
|
|
|
3c6e85 |
- fc_port_t *fcport = sp->fcport;
|
|
|
3c6e85 |
- struct ct_sns_rsp *ct_rsp;
|
|
|
3c6e85 |
- struct event_arg ea;
|
|
|
3c6e85 |
-
|
|
|
3c6e85 |
- ql_dbg(ql_dbg_disc, vha, 0x2133,
|
|
|
3c6e85 |
- "Async done-%s res %x ID %x. %8phC\n",
|
|
|
3c6e85 |
- sp->name, res, fcport->d_id.b24, fcport->port_name);
|
|
|
3c6e85 |
-
|
|
|
3c6e85 |
- fcport->flags &= ~FCF_ASYNC_SENT;
|
|
|
3c6e85 |
- ct_rsp = &fcport->ct_desc.ct_sns->p.rsp;
|
|
|
3c6e85 |
- /*
|
|
|
3c6e85 |
- * FC-GS-7, 5.2.3.12 FC-4 Features - format
|
|
|
3c6e85 |
- * The format of the FC-4 Features object, as defined by the FC-4,
|
|
|
3c6e85 |
- * Shall be an array of 4-bit values, one for each type code value
|
|
|
3c6e85 |
- */
|
|
|
3c6e85 |
- if (!res) {
|
|
|
3c6e85 |
- if (ct_rsp->rsp.gff_id.fc4_features[GFF_FCP_SCSI_OFFSET] & 0xf) {
|
|
|
3c6e85 |
- /* w1 b00:03 */
|
|
|
3c6e85 |
- fcport->fc4_type =
|
|
|
3c6e85 |
- ct_rsp->rsp.gff_id.fc4_features[GFF_FCP_SCSI_OFFSET];
|
|
|
3c6e85 |
- fcport->fc4_type &= 0xf;
|
|
|
3c6e85 |
- }
|
|
|
3c6e85 |
+ struct srb *sp = s;
|
|
|
3c6e85 |
+ struct scsi_qla_host *vha = sp->vha;
|
|
|
3c6e85 |
+ fc_port_t *fcport = sp->fcport;
|
|
|
3c6e85 |
+ struct ct_sns_rsp *ct_rsp;
|
|
|
3c6e85 |
+ struct event_arg ea;
|
|
|
3c6e85 |
+
|
|
|
3c6e85 |
+ ql_dbg(ql_dbg_disc, vha, 0x2133,
|
|
|
3c6e85 |
+ "Async done-%s res %x ID %x. %8phC\n",
|
|
|
3c6e85 |
+ sp->name, res, fcport->d_id.b24, fcport->port_name);
|
|
|
3c6e85 |
|
|
|
3c6e85 |
- if (ct_rsp->rsp.gff_id.fc4_features[GFF_NVME_OFFSET] & 0xf) {
|
|
|
3c6e85 |
- /* w5 [00:03]/28h */
|
|
|
3c6e85 |
- fcport->fc4f_nvme =
|
|
|
3c6e85 |
- ct_rsp->rsp.gff_id.fc4_features[GFF_NVME_OFFSET];
|
|
|
3c6e85 |
- fcport->fc4f_nvme &= 0xf;
|
|
|
3c6e85 |
+ fcport->flags &= ~FCF_ASYNC_SENT;
|
|
|
3c6e85 |
+ ct_rsp = &fcport->ct_desc.ct_sns->p.rsp;
|
|
|
3c6e85 |
+ /*
|
|
|
3c6e85 |
+ * FC-GS-7, 5.2.3.12 FC-4 Features - format
|
|
|
3c6e85 |
+ * The format of the FC-4 Features object, as defined by the FC-4,
|
|
|
3c6e85 |
+ * Shall be an array of 4-bit values, one for each type code value
|
|
|
3c6e85 |
+ */
|
|
|
3c6e85 |
+ if (!res) {
|
|
|
3c6e85 |
+ if (ct_rsp->rsp.gff_id.fc4_features[GFF_FCP_SCSI_OFFSET] & 0xf) {
|
|
|
3c6e85 |
+ /* w1 b00:03 */
|
|
|
3c6e85 |
+ fcport->fc4_type =
|
|
|
3c6e85 |
+ ct_rsp->rsp.gff_id.fc4_features[GFF_FCP_SCSI_OFFSET];
|
|
|
3c6e85 |
+ fcport->fc4_type &= 0xf;
|
|
|
3c6e85 |
}
|
|
|
3c6e85 |
- }
|
|
|
3c6e85 |
|
|
|
3c6e85 |
- memset(&ea, 0, sizeof(ea));
|
|
|
3c6e85 |
- ea.sp = sp;
|
|
|
3c6e85 |
- ea.fcport = sp->fcport;
|
|
|
3c6e85 |
- ea.rc = res;
|
|
|
3c6e85 |
- ea.event = FCME_GFFID_DONE;
|
|
|
3c6e85 |
+ if (ct_rsp->rsp.gff_id.fc4_features[GFF_NVME_OFFSET] & 0xf) {
|
|
|
3c6e85 |
+ /* w5 [00:03]/28h */
|
|
|
3c6e85 |
+ fcport->fc4f_nvme =
|
|
|
3c6e85 |
+ ct_rsp->rsp.gff_id.fc4_features[GFF_NVME_OFFSET];
|
|
|
3c6e85 |
+ fcport->fc4f_nvme &= 0xf;
|
|
|
3c6e85 |
+ }
|
|
|
3c6e85 |
+ }
|
|
|
3c6e85 |
|
|
|
3c6e85 |
- qla2x00_fcport_event_handler(vha, &ea);
|
|
|
3c6e85 |
- sp->free(sp);
|
|
|
3c6e85 |
+ memset(&ea, 0, sizeof(ea));
|
|
|
3c6e85 |
+ ea.sp = sp;
|
|
|
3c6e85 |
+ ea.fcport = sp->fcport;
|
|
|
3c6e85 |
+ ea.rc = res;
|
|
|
3c6e85 |
+ ea.event = FCME_GFFID_DONE;
|
|
|
3c6e85 |
+
|
|
|
3c6e85 |
+ qla2x00_fcport_event_handler(vha, &ea);
|
|
|
3c6e85 |
+ sp->free(sp);
|
|
|
3c6e85 |
}
|
|
|
3c6e85 |
|
|
|
3c6e85 |
/* Get FC4 Feature with Nport ID. */
|
|
|
3c6e85 |
--
|
|
|
3c6e85 |
2.13.6
|
|
|
3c6e85 |
|