Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

2 files changed, 48 insertions, 1 deletions

diff --git a/testsuite/buildok/netdev.stp b/testsuite/buildok/netdev.stp
new file mode 100755
index 00000000..25510379
--- /dev/null
+++ b/testsuite/buildok/netdev.stp
@@ -0,0 +1,47 @@
+#! /usr/bin/env stap -wp4
+
+probe netdev.get_stats{
+	printf("%s", dev_name)
+}
+
+probe netdev.register{
+	printf("%s", dev_name)
+}
+
+probe netdev.unregister{
+	printf("%s", dev_name)
+}
+
+probe netdev.ioctl{
+	printf("%d %s", cmd, arg)
+}
+
+probe netdev.set_promiscuity {
+	printf("%s %d %d %d", dev_name, enable,
+				disable, inc)
+}
+
+probe netdev.change_rx_flag {
+	printf("%s %d", dev_name, flags)
+}
+
+probe netdev.change_mtu {
+	printf("%s %d %d", dev_name, old_mtu, new_mtu)
+}
+
+probe netdev.change_mac {
+	printf("%s %s %s", dev_name, old_mac, new_mac)
+}
+
+probe netdev.transmit {
+	printf("%s %d %d %d", dev_name, protocol,
+				length, truesize)
+}
+
+probe netdev.hard_transmit {
+	printf("%s %d", dev_name, protocol)
+}
+
+probe netdev.receive {
+	printf("%s %d", dev_name, protocol)
+}
diff --git a/testsuite/buildok/networking.stp b/testsuite/buildok/networking.stp
index 24f22b09..3e6a31ea 100755
--- a/testsuite/buildok/networking.stp
+++ b/testsuite/buildok/networking.stp
@@ -1,5 +1,5 @@
 #! stap -p4
-probe netdev.*
+probe netdev.transmit, netdev.receive
 {
 	printf("ppname: %s, dev_name: %s, %d, %d, %d\n", probefunc(),
 		dev_name, length, protocol, truesize)