summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla2xxx/qla_def.h
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2018-03-27 18:27:34 +0200
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2018-04-04 02:38:39 +0200
commit2e1f44f6ad8008be353c7c99286f7a747b4b3cf4 (patch)
tree9ab4f369e72a6f1953f53269030bbba047c6be8a /drivers/scsi/qla2xxx/qla_def.h
parentscsi: ufs: Add support for Auto-Hibernate Idle Timer (diff)
parentscsi: qla2xxx: fx00 copypaste typo (diff)
downloadlinux-2e1f44f6ad8008be353c7c99286f7a747b4b3cf4.tar.xz
linux-2e1f44f6ad8008be353c7c99286f7a747b4b3cf4.zip
Merge branch 'fixes' into misc
Somewhat nasty merge due to conflicts between "33b28357dd00 scsi: qla2xxx: Fix Async GPN_FT for FCP and FC-NVMe scan" and "2b5b96473efc scsi: qla2xxx: Fix FC-NVMe LUN discovery" Merge is non-trivial and has been verified by Qlogic (Cavium) Signed-off-by: James E.J. Bottomley <jejb@linux.vnet.ibm.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_def.h')
-rw-r--r--drivers/scsi/qla2xxx/qla_def.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 54625eb2904f..eb2ec1fb07cb 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -261,9 +261,9 @@
struct name_list_extended {
struct get_name_list_extended *l;
dma_addr_t ldma;
- struct list_head fcports; /* protect by sess_list */
+ struct list_head fcports;
+ spinlock_t fcports_lock;
u32 size;
- u8 sent;
};
/*
* Timeout timer counts in seconds