[PATCH] IB: Move SA attributes to ib_sa.h

SA: Move SA attributes to ib_sa.h so are accessible to more than
sa_query.c. Also, remove deprecated attributes and add one missing one.

Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

2 files changed, 25 insertions, 26 deletions

diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index 9191793c9007..78de2dd1a4f2 100644
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -113,32 +113,6 @@ static DEFINE_IDR(query_idr);
 static spinlock_t tid_lock;
 static u32 tid;
 
-enum {
-        IB_SA_ATTR_CLASS_PORTINFO    = 0x01,
-        IB_SA_ATTR_NOTICE            = 0x02,
-        IB_SA_ATTR_INFORM_INFO       = 0x03,
-        IB_SA_ATTR_NODE_REC          = 0x11,
-        IB_SA_ATTR_PORT_INFO_REC     = 0x12,
-        IB_SA_ATTR_SL2VL_REC         = 0x13,
-        IB_SA_ATTR_SWITCH_REC        = 0x14,
-        IB_SA_ATTR_LINEAR_FDB_REC    = 0x15,
-        IB_SA_ATTR_RANDOM_FDB_REC    = 0x16,
-        IB_SA_ATTR_MCAST_FDB_REC     = 0x17,
-        IB_SA_ATTR_SM_INFO_REC       = 0x18,
-        IB_SA_ATTR_LINK_REC          = 0x20,
-        IB_SA_ATTR_GUID_INFO_REC     = 0x30,
-        IB_SA_ATTR_SERVICE_REC       = 0x31,
-        IB_SA_ATTR_PARTITION_REC     = 0x33,
-        IB_SA_ATTR_RANGE_REC         = 0x34,
-        IB_SA_ATTR_PATH_REC          = 0x35,
-        IB_SA_ATTR_VL_ARB_REC        = 0x36,
-        IB_SA_ATTR_MC_GROUP_REC      = 0x37,
-        IB_SA_ATTR_MC_MEMBER_REC     = 0x38,
-        IB_SA_ATTR_TRACE_REC         = 0x39,
-        IB_SA_ATTR_MULTI_PATH_REC    = 0x3a,
-        IB_SA_ATTR_SERVICE_ASSOC_REC = 0x3b
-};
-
 #define PATH_REC_FIELD(field) \
         .struct_offset_bytes = offsetof(struct ib_sa_path_rec, field),          \
         .struct_size_bytes   = sizeof ((struct ib_sa_path_rec *) 0)->field,     \
diff --git a/include/rdma/ib_sa.h b/include/rdma/ib_sa.h
index 0f4f5ec85e82..a7555c800ecf 100644
--- a/include/rdma/ib_sa.h
+++ b/include/rdma/ib_sa.h
@@ -53,6 +53,31 @@ enum {
         IB_SA_METHOD_GET_TRACE_TBL      = 0x13
 };
 
+enum {
+        IB_SA_ATTR_CLASS_PORTINFO    = 0x01,
+        IB_SA_ATTR_NOTICE            = 0x02,
+        IB_SA_ATTR_INFORM_INFO       = 0x03,
+        IB_SA_ATTR_NODE_REC          = 0x11,
+        IB_SA_ATTR_PORT_INFO_REC     = 0x12,
+        IB_SA_ATTR_SL2VL_REC         = 0x13,
+        IB_SA_ATTR_SWITCH_REC        = 0x14,
+        IB_SA_ATTR_LINEAR_FDB_REC    = 0x15,
+        IB_SA_ATTR_RANDOM_FDB_REC    = 0x16,
+        IB_SA_ATTR_MCAST_FDB_REC     = 0x17,
+        IB_SA_ATTR_SM_INFO_REC       = 0x18,
+        IB_SA_ATTR_LINK_REC          = 0x20,
+        IB_SA_ATTR_GUID_INFO_REC     = 0x30,
+        IB_SA_ATTR_SERVICE_REC       = 0x31,
+        IB_SA_ATTR_PARTITION_REC     = 0x33,
+        IB_SA_ATTR_PATH_REC          = 0x35,
+        IB_SA_ATTR_VL_ARB_REC        = 0x36,
+        IB_SA_ATTR_MC_MEMBER_REC     = 0x38,
+        IB_SA_ATTR_TRACE_REC         = 0x39,
+        IB_SA_ATTR_MULTI_PATH_REC    = 0x3a,
+        IB_SA_ATTR_SERVICE_ASSOC_REC = 0x3b,
+        IB_SA_ATTR_INFORM_INFO_REC   = 0xf3
+};
+
 enum ib_sa_selector {
         IB_SA_GTE  = 0,
         IB_SA_LTE  = 1,