From 0c14bfee665b64a8437396672c36ba411192a6e4 Mon Sep 17 00:00:00 2001 From: eeb Date: Mon, 6 Dec 2004 20:55:49 +0000 Subject: [PATCH] * Merged changes from HEAD and b_cray in preparation for portals separation --- lnet/klnds/openiblnd/openiblnd.c | 10 +++++----- lnet/klnds/openiblnd/openiblnd.h | 6 +++--- lnet/klnds/openiblnd/openiblnd_cb.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lnet/klnds/openiblnd/openiblnd.c b/lnet/klnds/openiblnd/openiblnd.c index 38013d1..652eb34 100644 --- 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(tTS_IB_COMMON_ATTRIB_SERVICE service, char *tag, int rc) +print_service(struct ib_common_attrib_service *service, char *tag, int rc) { char name[32]; @@ -71,7 +71,7 @@ print_service(tTS_IB_COMMON_ATTRIB_SERVICE service, char *tag, int rc) void kibnal_service_setunset_done (tTS_IB_CLIENT_QUERY_TID tid, int status, - tTS_IB_COMMON_ATTRIB_SERVICE service, void *arg) + struct 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) { - tTS_IB_COMMON_ATTRIB_SERVICE svc; + struct ib_common_attrib_service *svc; __u64 tid; int rc; int rc2; @@ -118,7 +118,7 @@ kibnal_check_advert (void) int kibnal_advertise (void) { - tTS_IB_COMMON_ATTRIB_SERVICE svc; + struct ib_common_attrib_service *svc; __u64 tid; int rc; int rc2; @@ -192,7 +192,7 @@ kibnal_advertise (void) void kibnal_unadvertise (int expect_success) { - tTS_IB_COMMON_ATTRIB_SERVICE svc; + struct 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 b5c5f91..f0610f2 100644 --- 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; - tTS_IB_COMMON_ATTRIB_SERVICE_STRUCT cr_service; + struct ib_common_attrib_service 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(tTS_IB_COMMON_ATTRIB_SERVICE srv) +kibnal_service_nid_field(struct 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(tTS_IB_COMMON_ATTRIB_SERVICE srv) static inline void -kibnal_set_service_keys(tTS_IB_COMMON_ATTRIB_SERVICE srv, ptl_nid_t nid) +kibnal_set_service_keys(struct 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 b05487d..d774853 100644 --- 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, - tTS_IB_COMMON_ATTRIB_SERVICE resp, void *arg) + struct ib_common_attrib_service *resp, void *arg) { kib_conn_t *conn = arg; -- 1.8.3.1