Merge tag 'csky-for-linus-4.21' of git://github.com/c-sky/csky-linux

[sfrench/cifs-2.6.git] / include / scsi / srp.h

diff --git a/include/scsi/srp.h b/include/scsi/srp.h
index c16a3c9a4d9b30cbcc8652a487f28c78dc22d6d8..9220758d5087ef25bb769245ed24564179402f7a 100644 (file)
--- a/include/scsi/srp.h
+++ b/include/scsi/srp.h
@@ -67,7 +67,8 @@ enum {
 enum {
        SRP_NO_DATA_DESC        = 0,
        SRP_DATA_DESC_DIRECT    = 1,
-       SRP_DATA_DESC_INDIRECT  = 2
+       SRP_DATA_DESC_INDIRECT  = 2,
+       SRP_DATA_DESC_IMM       = 3,    /* new in SRP2 */
 };
 
 enum {
@@ -111,9 +112,16 @@ struct srp_indirect_buf {
        struct srp_direct_buf   desc_list[0];
 } __attribute__((packed));
 
+/* Immediate data buffer descriptor as defined in SRP2. */
+struct srp_imm_buf {
+       __be32  len;
+};
+
+/* srp_login_req.flags */
 enum {
        SRP_MULTICHAN_SINGLE = 0,
-       SRP_MULTICHAN_MULTI  = 1
+       SRP_MULTICHAN_MULTI  = 1,
+       SRP_IMMED_REQUESTED  = 0x80,    /* new in SRP2 */
 };
 
 struct srp_login_req {
@@ -124,7 +132,9 @@ struct srp_login_req {
        u8      reserved2[4];
        __be16  req_buf_fmt;
        u8      req_flags;
-       u8      reserved3[5];
+       u8      reserved3[1];
+       __be16  imm_data_offset;        /* new in SRP2 */
+       u8      reserved4[2];
        u8      initiator_port_id[16];
        u8      target_port_id[16];
 };
@@ -144,6 +154,16 @@ struct srp_login_req_rdma {
        __be32  req_it_iu_len;
        u8      initiator_port_id[16];
        u8      target_port_id[16];
+       __be16  imm_data_offset;
+       u8      reserved[6];
+};
+
+/* srp_login_rsp.rsp_flags */
+enum {
+       SRP_LOGIN_RSP_MULTICHAN_NO_CHAN    = 0x0,
+       SRP_LOGIN_RSP_MULTICHAN_TERMINATED = 0x1,
+       SRP_LOGIN_RSP_MULTICHAN_MAINTAINED = 0x2,
+       SRP_LOGIN_RSP_IMMED_SUPP           = 0x80, /* new in SRP2 */
 };
 
 /*