revert API update that broke the OpenIB Nal

diff --git a/lnet/klnds/openiblnd/openiblnd.c b/lnet/klnds/openiblnd/openiblnd.c
index 652eb34..38013d1 100644 (file)
--- a/lnet/klnds/openiblnd/openiblnd.c
+++ b/lnet/klnds/openiblnd/openiblnd.c
@@ -47,7 +47,7 @@ static ctl_table kibnal_top_ctl_table[] = {
 #endif
 
 void
-print_service(struct ib_common_attrib_service *service, char *tag, int rc)
+print_service(tTS_IB_COMMON_ATTRIB_SERVICE service, char *tag, int rc)
 {
         char name[32];
 
@@ -71,7 +71,7 @@ print_service(struct ib_common_attrib_service *service, char *tag, int rc)
 
 void
 kibnal_service_setunset_done (tTS_IB_CLIENT_QUERY_TID tid, int status,
-                               struct ib_common_attrib_service *service, void *arg)
+                               tTS_IB_COMMON_ATTRIB_SERVICE service, void *arg)
 {
         *(int *)arg = status;
         up (&kibnal_data.kib_nid_signal);
@@ -81,7 +81,7 @@ kibnal_service_setunset_done (tTS_IB_CLIENT_QUERY_TID tid, int status,
 void
 kibnal_check_advert (void)
 {
-        struct ib_common_attrib_service *svc;
+        tTS_IB_COMMON_ATTRIB_SERVICE svc;
         __u64   tid;
         int     rc;
         int     rc2;
@@ -118,7 +118,7 @@ kibnal_check_advert (void)
 int
 kibnal_advertise (void)
 {
-        struct ib_common_attrib_service *svc;
+        tTS_IB_COMMON_ATTRIB_SERVICE svc;
         __u64   tid;
         int     rc;
         int     rc2;
@@ -192,7 +192,7 @@ kibnal_advertise (void)
 void
 kibnal_unadvertise (int expect_success)
 {
-        struct ib_common_attrib_service *svc;
+        tTS_IB_COMMON_ATTRIB_SERVICE svc;
         __u64   tid;
         int     rc;
         int     rc2;

diff --git a/lnet/klnds/openiblnd/openiblnd.h b/lnet/klnds/openiblnd/openiblnd.h
index f0610f2..b5c5f91 100644 (file)
--- a/lnet/klnds/openiblnd/openiblnd.h
+++ b/lnet/klnds/openiblnd/openiblnd.h
@@ -320,7 +320,7 @@ typedef struct kib_connreq
         struct kib_conn                    *cr_conn;
         kib_wire_connreq_t                  cr_wcr;
         __u64                               cr_tid;
-        struct ib_common_attrib_service     cr_service;
+        tTS_IB_COMMON_ATTRIB_SERVICE_STRUCT cr_service;
         tTS_IB_GID                          cr_gid;
         struct ib_path_record               cr_path;
         struct ib_cm_active_param           cr_connparam;
@@ -413,7 +413,7 @@ kibnal_queue_tx_locked (kib_tx_t *tx, kib_conn_t *conn)
                                   IB_SA_SERVICE_COMP_MASK_DATA8_8)
 
 static inline __u64*
-kibnal_service_nid_field(struct ib_common_attrib_service *srv)
+kibnal_service_nid_field(tTS_IB_COMMON_ATTRIB_SERVICE srv)
 {
         /* must be consistent with KIBNAL_SERVICE_KEY_MASK */
         return (__u64 *)srv->service_data8;
@@ -421,7 +421,7 @@ kibnal_service_nid_field(struct ib_common_attrib_service *srv)
 
 
 static inline void
-kibnal_set_service_keys(struct ib_common_attrib_service *srv, ptl_nid_t nid)
+kibnal_set_service_keys(tTS_IB_COMMON_ATTRIB_SERVICE srv, ptl_nid_t nid)
 {
         LASSERT (strlen (IBNAL_SERVICE_NAME) < sizeof(srv->service_name));
         memset (srv->service_name, 0, sizeof(srv->service_name));

diff --git a/lnet/klnds/openiblnd/openiblnd_cb.c b/lnet/klnds/openiblnd/openiblnd_cb.c
index d774853..b05487d 100644 (file)
--- a/lnet/klnds/openiblnd/openiblnd_cb.c
+++ b/lnet/klnds/openiblnd/openiblnd_cb.c
@@ -2191,7 +2191,7 @@ kibnal_pathreq_callback (tTS_IB_CLIENT_QUERY_TID tid, int status,
 
 void
 kibnal_service_get_callback (tTS_IB_CLIENT_QUERY_TID tid, int status,
-                             struct ib_common_attrib_service *resp, void *arg)
+                             tTS_IB_COMMON_ATTRIB_SERVICE resp, void *arg)
 {
         kib_conn_t *conn = arg;