- include the portals ping client/server in the 2.5 build

- default to the socknal in the ping server

diff --git a/lnet/Makefile.mk b/lnet/Makefile.mk
index a727993..cda2593 100644 (file)
--- a/lnet/Makefile.mk
+++ b/lnet/Makefile.mk
@@ -7,3 +7,4 @@ obj-y += libcfs/
 obj-y += portals/
 obj-y += router/
 obj-y += knals/
+obj-y += tests/

diff --git a/lnet/tests/.cvsignore b/lnet/tests/.cvsignore
index 051d1bd..d0c4c88 100644 (file)
--- a/lnet/tests/.cvsignore
+++ b/lnet/tests/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 Makefile.in
 .deps
+.*.o.cmd

diff --git a/lnet/tests/ping_srv.c b/lnet/tests/ping_srv.c
index 1037d09..c4c8057 100644 (file)
--- a/lnet/tests/ping_srv.c
+++ b/lnet/tests/ping_srv.c
@@ -51,7 +51,7 @@
 
 static unsigned ping_head_magic;
 static unsigned ping_bulk_magic;
-static int nal  = 0;                            // Your NAL,
+static int nal  = 1;                            // Your NAL,
 static unsigned long packets_valid = 0;         // Valid packets 
 static int running = 1;
 atomic_t pkt;

diff --git a/lustre/portals/Makefile.mk b/lustre/portals/Makefile.mk
index a727993..cda2593 100644 (file)
--- a/lustre/portals/Makefile.mk
+++ b/lustre/portals/Makefile.mk
@@ -7,3 +7,4 @@ obj-y += libcfs/
 obj-y += portals/
 obj-y += router/
 obj-y += knals/
+obj-y += tests/

diff --git a/lustre/portals/tests/.cvsignore b/lustre/portals/tests/.cvsignore
index 051d1bd..d0c4c88 100644 (file)
--- a/lustre/portals/tests/.cvsignore
+++ b/lustre/portals/tests/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 Makefile.in
 .deps
+.*.o.cmd

diff --git a/lustre/portals/tests/ping_srv.c b/lustre/portals/tests/ping_srv.c
index 1037d09..c4c8057 100644 (file)
--- a/lustre/portals/tests/ping_srv.c
+++ b/lustre/portals/tests/ping_srv.c
@@ -51,7 +51,7 @@
 
 static unsigned ping_head_magic;
 static unsigned ping_bulk_magic;
-static int nal  = 0;                            // Your NAL,
+static int nal  = 1;                            // Your NAL,
 static unsigned long packets_valid = 0;         // Valid packets 
 static int running = 1;
 atomic_t pkt;