These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / scsi / qla2xxx / tcm_qla2xxx.h

diff --git a/kernel/drivers/scsi/qla2xxx/tcm_qla2xxx.h b/kernel/drivers/scsi/qla2xxx/tcm_qla2xxx.h
index 2329511..3bbf4cb 100644 (file)
--- a/kernel/drivers/scsi/qla2xxx/tcm_qla2xxx.h
+++ b/kernel/drivers/scsi/qla2xxx/tcm_qla2xxx.h
@@ -13,6 +13,8 @@
 #include "qla_target.h"
 
 struct tcm_qla2xxx_nacl {
+       struct se_node_acl se_node_acl;
+
        /* From libfc struct fc_rport->port_id */
        u32 nport_id;
        /* Binary World Wide unique Node Name for remote FC Initiator Nport */
@@ -23,8 +25,6 @@ struct tcm_qla2xxx_nacl {
        struct qla_tgt_sess *qla_tgt_sess;
        /* Pointer to TCM FC nexus */
        struct se_session *nport_nexus;
-       /* Returned by tcm_qla2xxx_make_nodeacl() */
-       struct se_node_acl se_node_acl;
 };
 
 struct tcm_qla2xxx_tpg_attrib {
@@ -57,8 +57,6 @@ struct tcm_qla2xxx_fc_loopid {
 };
 
 struct tcm_qla2xxx_lport {
-       /* SCSI protocol the lport is providing */
-       u8 lport_proto_id;
        /* Binary World Wide unique Port Name for FC Target Lport */
        u64 lport_wwpn;
        /* Binary World Wide unique Port Name for FC NPIV Target Lport */