Landing b_hd_newconfig on HEAD

[fs/lustre-release.git] / lnet / tests / ping.h

diff --git a/lnet/tests/ping.h b/lnet/tests/ping.h
index ef937af..1dde8bc 100644 (file)
--- a/lnet/tests/ping.h
+++ b/lnet/tests/ping.h
@@ -2,7 +2,7 @@
 #define _KPING_INCLUDED
 
 #include <libcfs/portals_utils.h>
-#include <portals/p30.h>
+#include <lnet/lnet.h>
 
 
 #define PTL_PING_IN_SIZE               256     // n packets per buffer
@@ -28,7 +28,7 @@
        (((index + 1) >= PTL_PING_IN_BUFFERS) ? 0 : (index + 1))
 
 #define PDEBUG(str, err)                       \
-       CERROR ("%s: error=%s (%d)\n", str, ptl_err_str[err], err)
+       CERROR ("%s: error=(%d)\n", str, err)
 
 
 /* Ping data to be passed via the ioctl to kernel space */
@@ -36,36 +36,37 @@
 #if __KERNEL__
 
 struct pingsrv_data {
-        
-        ptl_handle_ni_t         ni;
-        ptl_handle_me_t         me;
-        ptl_handle_eq_t         eq;
-        void                   *in_buf;
-        ptl_process_id_t        my_id;
-        ptl_process_id_t        id_local;
-        ptl_md_t                mdin;
-        ptl_md_t                mdout;
-        ptl_handle_md_t         mdin_h;
-        ptl_handle_md_t         mdout_h;
-        ptl_event_t             evnt;
+       lnet_handle_me_t         me;
+        lnet_handle_eq_t         eq;
+        void                    *in_buf;
+        lnet_process_id_t        my_id;
+        lnet_process_id_t        id_local;
+        lnet_md_t                mdin;
+        lnet_md_t                mdout;
+        lnet_handle_md_t         mdin_h;
+        lnet_handle_md_t         mdout_h;
+        lnet_event_t             evnt;
         cfs_task_t             *tsk;
 }; /* struct pingsrv_data */
  
 struct pingcli_data {
         
-        struct portal_ioctl_data *args;
-        ptl_handle_me_t        me;
-        ptl_handle_eq_t                eq;
+       int                     count;
+       int                     size;
+       lnet_nid_t              nid;
+       int                     timeout;
+        lnet_handle_me_t       me;
+        lnet_handle_eq_t       eq;
         char                          *inbuf;    
         char                   *outbuf;   
-        ptl_process_id_t       myid; 
-        ptl_process_id_t       id_local; 
-        ptl_process_id_t       id_remote;
-        ptl_md_t               md_in_head;
-        ptl_md_t               md_out_head;
-        ptl_handle_md_t        md_in_head_h;
-        ptl_handle_md_t        md_out_head_h;
-        ptl_event_t            ev;
+        lnet_process_id_t      myid; 
+        lnet_process_id_t      id_local; 
+        lnet_process_id_t      id_remote;
+        lnet_md_t              md_in_head;
+        lnet_md_t              md_out_head;
+        lnet_handle_md_t       md_in_head_h;
+        lnet_handle_md_t       md_out_head_h;
+        lnet_event_t           ev;
         cfs_task_t             *tsk;
 }; /* struct pingcli_data */