* Landed b_cray_portals_merge.

[fs/lustre-release.git] / lnet / lnet / lib-ni.c

diff --git a/lnet/lnet/lib-ni.c b/lnet/lnet/lib-ni.c
index aa30329..aa959fc 100644 (file)
--- a/lnet/lnet/lib-ni.c
+++ b/lnet/lnet/lib-ni.c
@@ -27,19 +27,7 @@
 #include <portals/lib-p30.h>
 #include <portals/arg-blocks.h>
 
-#define MAX_DIST 18446744073709551615UL
-
-int do_PtlNIDebug(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
-{
-        PtlNIDebug_in *args = v_args;
-        PtlNIDebug_out *ret = v_ret;
-        lib_ni_t *ni = &nal->ni;
-
-        ret->rc = ni->debug;
-        ni->debug = args->mask_in;
-
-        return 0;
-}
+#define MAX_DIST 18446744073709551615ULL
 
 int do_PtlNIStatus(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
 {
@@ -88,7 +76,7 @@ int do_PtlNIStatus(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
         else if (args->register_in == PTL_SR_MSGS_MAX)
                 ret->status_out = count->msgs_max;
         else
-                ret->rc = PTL_INV_SR_INDX;
+                ret->rc = PTL_SR_INDEX_INVALID;
 
         return ret->rc;
 }
@@ -119,7 +107,7 @@ int do_PtlNIDist(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
 
         if ((rc = nal->cb_dist(nal, nid, &dist)) != 0) {
                 ret->distance_out = (unsigned long) MAX_DIST;
-                return PTL_INV_PROC;
+                return PTL_PROCESS_INVALID;
         }
 
         ret->distance_out = dist;