diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-22 16:55:28 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-22 16:55:28 +1000 |
| commit | 1189980c0feab946920581d9bd45e754e86e5367 (patch) | |
| tree | 005fb23634d190e22dbf20357de10026eee6b863 /drivers/infiniband/ulp/srpt/ib_srpt.h | |
| parent | 004d15e63383bfd316b731d5c35253b943425091 (diff) | |
| parent | 36fac4b04185ac3e685f1c729a8095fb229867fc (diff) | |
Merge remote-tracking branch 'target-updates/for-next'
Diffstat (limited to 'drivers/infiniband/ulp/srpt/ib_srpt.h')
| -rw-r--r-- | drivers/infiniband/ulp/srpt/ib_srpt.h | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.h b/drivers/infiniband/ulp/srpt/ib_srpt.h index 3dae156905de..6fec740742bd 100644 --- a/drivers/infiniband/ulp/srpt/ib_srpt.h +++ b/drivers/infiniband/ulp/srpt/ib_srpt.h @@ -238,7 +238,6 @@ struct srpt_send_ioctx { bool rdma_aborted; struct se_cmd cmd; struct completion tx_done; - u64 tag; int sg_cnt; int mapped_sg_count; u16 n_rdma_ius; @@ -410,34 +409,16 @@ struct srpt_device { /** * struct srpt_node_acl - Per-initiator ACL data (managed via configfs). + * @nacl: Target core node ACL information. * @i_port_id: 128-bit SRP initiator port ID. * @sport: port information. - * @nacl: Target core node ACL information. * @list: Element of the per-HCA ACL list. */ struct srpt_node_acl { + struct se_node_acl nacl; u8 i_port_id[16]; struct srpt_port *sport; - struct se_node_acl nacl; struct list_head list; }; -/* - * SRP-releated SCSI persistent reservation definitions. - * - * See also SPC4r28, section 7.6.1 (Protocol specific parameters introduction). - * See also SPC4r28, section 7.6.4.5 (TransportID for initiator ports using - * SCSI over an RDMA interface). - */ - -enum { - SCSI_TRANSPORTID_PROTOCOLID_SRP = 4, -}; - -struct spc_rdma_transport_id { - uint8_t protocol_identifier; - uint8_t reserved[7]; - uint8_t i_port_id[16]; -}; - #endif /* IB_SRPT_H */ |