IB/core: Move CM_xxx_ATTR_ID macros from cm_msgs.h to ib_cm.h

These macros will be reused by the mlx4 SRIOV-IB CM paravirtualization
code, and there is no reason to have them declared both in the IB core
in the mlx4 IB driver.

Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

diff --git a/drivers/infiniband/core/cm_msgs.h b/drivers/infiniband/core/cm_msgs.h
index 7da9b2102341c2f364f31989aa656d4d750272ee..be068f47e47e86b79065356e62bf1d193c1da36f 100644 (file)
--- a/drivers/infiniband/core/cm_msgs.h
+++ b/drivers/infiniband/core/cm_msgs.h
@@ -44,18 +44,6 @@
 
 #define IB_CM_CLASS_VERSION    2 /* IB specification 1.2 */
 
-#define CM_REQ_ATTR_ID         cpu_to_be16(0x0010)
-#define CM_MRA_ATTR_ID         cpu_to_be16(0x0011)
-#define CM_REJ_ATTR_ID         cpu_to_be16(0x0012)
-#define CM_REP_ATTR_ID         cpu_to_be16(0x0013)
-#define CM_RTU_ATTR_ID         cpu_to_be16(0x0014)
-#define CM_DREQ_ATTR_ID                cpu_to_be16(0x0015)
-#define CM_DREP_ATTR_ID                cpu_to_be16(0x0016)
-#define CM_SIDR_REQ_ATTR_ID    cpu_to_be16(0x0017)
-#define CM_SIDR_REP_ATTR_ID    cpu_to_be16(0x0018)
-#define CM_LAP_ATTR_ID         cpu_to_be16(0x0019)
-#define CM_APR_ATTR_ID         cpu_to_be16(0x001A)
-
 enum cm_msg_sequence {
        CM_MSG_SEQUENCE_REQ,
        CM_MSG_SEQUENCE_LAP,

diff --git a/include/rdma/ib_cm.h b/include/rdma/ib_cm.h
index 83f77ac33957187b286d9bd73a0156d414d38066..0e3ff30647d518483853cb9c52104991df966221 100644 (file)
--- a/include/rdma/ib_cm.h
+++ b/include/rdma/ib_cm.h
@@ -262,6 +262,18 @@ struct ib_cm_event {
        void                    *private_data;
 };
 
+#define CM_REQ_ATTR_ID         cpu_to_be16(0x0010)
+#define CM_MRA_ATTR_ID         cpu_to_be16(0x0011)
+#define CM_REJ_ATTR_ID         cpu_to_be16(0x0012)
+#define CM_REP_ATTR_ID         cpu_to_be16(0x0013)
+#define CM_RTU_ATTR_ID         cpu_to_be16(0x0014)
+#define CM_DREQ_ATTR_ID                cpu_to_be16(0x0015)
+#define CM_DREP_ATTR_ID                cpu_to_be16(0x0016)
+#define CM_SIDR_REQ_ATTR_ID    cpu_to_be16(0x0017)
+#define CM_SIDR_REP_ATTR_ID    cpu_to_be16(0x0018)
+#define CM_LAP_ATTR_ID         cpu_to_be16(0x0019)
+#define CM_APR_ATTR_ID         cpu_to_be16(0x001A)
+
 /**
  * ib_cm_handler - User-defined callback to process communication events.
  * @cm_id: Communication identifier associated with the reported event.