Adapt socket tapset to changes in 2.6.19.

2 files changed, 10 insertions, 5 deletions

diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index 9216640e..21c78ba1 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2007-0-2  Mike Mason <mmlnx@us.ibm.com>
+
+	* buildok/socket.stp: Adapted to changes in 2.6.19 socket routines.
+
 2007-04-24  Will Cohen  <wcohen@redhat.com>
 
 	* buildok/memory.stp: Test vm.pagefault.return.
diff --git a/testsuite/buildok/socket.stp b/testsuite/buildok/socket.stp
index cac6f714..4b9142a9 100755
--- a/testsuite/buildok/socket.stp
+++ b/testsuite/buildok/socket.stp
@@ -3,8 +3,12 @@
 probe socket.send, socket.receive,
       socket.sendmsg, socket.sendmsg.return,
       socket.recvmsg, socket.recvmsg.return,
-      socket.do_write, socket.do_write.return,
-      socket.do_read, socket.do_read.return
+%( kernel_v < "2.6.19" %?
+      socket.writev, socket.writev.return,
+      socket.readv, socket.readv.return,
+%)
+      socket.aio_write, socket.aio_write.return,
+      socket.aio_read, socket.aio_read.return
 {
 	log(pp())
 	log(name)
@@ -29,9 +33,6 @@ probe socket.send, socket.receive,
 	typ = sock_type_str2num(tstr)
 	log(sprintf("%d, %d, %s", type, typ, tstr))
 
-	mflstr = msg_flags_num2str(mflags)
-	log(sprintf("%d, %s", mflags, mflstr))
-
 	log(sprintf("%d", success))
 }