include/scsi/srp.h: Move response flag definitions into this file

This patch moves all constants that come from the SRP standard into the
include/scsi/srp.h header file.

Cc: Sergey Gorenko <sergeygo@mellanox.com>
Cc: Max Gurtovoy <maxg@mellanox.com>
Cc: Laurence Oberman <loberman@redhat.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.h b/drivers/infiniband/ulp/srpt/ib_srpt.h
index 444dfd7281b5fe774afc839cc3c9cced02642878..ce8b14f837855ca53b0dd555c77a07c269dd2dfe 100644 (file)
--- a/drivers/infiniband/ulp/srpt/ib_srpt.h
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.h
@@ -104,10 +104,6 @@ enum {
        SRP_CMD_ORDERED_Q = 0x2,
        SRP_CMD_ACA = 0x4,
 
-       SRP_LOGIN_RSP_MULTICHAN_NO_CHAN = 0x0,
-       SRP_LOGIN_RSP_MULTICHAN_TERMINATED = 0x1,
-       SRP_LOGIN_RSP_MULTICHAN_MAINTAINED = 0x2,
-
        SRPT_DEF_SG_TABLESIZE = 128,
        /*
         * An experimentally determined value that avoids that QP creation

diff --git a/include/scsi/srp.h b/include/scsi/srp.h
index c16a3c9a4d9b30cbcc8652a487f28c78dc22d6d8..15cb8cf8a604936e55529b4d5917146c403ed2fd 100644 (file)
--- a/include/scsi/srp.h
+++ b/include/scsi/srp.h
@@ -146,6 +146,13 @@ struct srp_login_req_rdma {
        u8      target_port_id[16];
 };
 
+/* 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,
+};
+
 /*
  * The SRP spec defines the size of the LOGIN_RSP structure to be 52
  * bytes, so it needs to be packed to avoid having it padded to 56