From 7c95a9d962f9ffdf02a3d82a6ae108c254a29122 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben.hutchings@codethink.co.uk>
Date: Tue, 24 Feb 2015 02:32:07 +0000
Subject: samples/pktgen: Add sample scripts for pktgen facility

These are Robert Olsson's samples which used to be available from
<ftp://robur.slu.se/pub/Linux/net-development/pktgen-testing/examples/>
but currently are not.

Change the documentation to refer to these consistently as 'sample
scripts', matching the directory name used here.

Cc: Robert Olsson <robert@herjulf.se>
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 samples/pktgen/pktgen.conf-1-1-ip6 | 67 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100755 samples/pktgen/pktgen.conf-1-1-ip6

(limited to 'samples/pktgen/pktgen.conf-1-1-ip6')

diff --git a/samples/pktgen/pktgen.conf-1-1-ip6 b/samples/pktgen/pktgen.conf-1-1-ip6
new file mode 100755
index 000000000000..752f112bd9e6
--- /dev/null
+++ b/samples/pktgen/pktgen.conf-1-1-ip6
@@ -0,0 +1,67 @@
+#! /bin/sh
+
+#modprobe pktgen
+
+
+function pgset() {
+    local result
+
+    echo $1 > $PGDEV
+
+    result=`cat $PGDEV | fgrep "Result: OK:"`
+    if [ "$result" = "" ]; then
+         cat $PGDEV | fgrep Result:
+    fi
+}
+
+function pg() {
+    echo inject > $PGDEV
+    cat $PGDEV
+}
+
+# Config Start Here -----------------------------------------------------------
+
+
+# thread config
+# Each CPU has own thread. Two CPU exammple. We add eth1, eth2 respectivly.
+# IPv6. Note increase in minimal packet length
+
+PGDEV=/proc/net/pktgen/kpktgend_0
+  echo "Removing all devices"
+ pgset "rem_device_all"
+  echo "Adding eth1"
+ pgset "add_device eth1"
+  echo "Setting max_before_softirq 10000"
+ pgset "max_before_softirq 10000"
+
+
+# device config
+# delay 0
+
+CLONE_SKB="clone_skb 1000000"
+# NIC adds 4 bytes CRC
+PKT_SIZE="pkt_size 66"
+
+# COUNT 0 means forever
+#COUNT="count 0"
+COUNT="count 10000000"
+DELAY="delay 0"
+
+PGDEV=/proc/net/pktgen/eth1
+  echo "Configuring $PGDEV"
+ pgset "$COUNT"
+ pgset "$CLONE_SKB"
+ pgset "$PKT_SIZE"
+ pgset "$DELAY"
+ pgset "dst6 fec0::1"
+ pgset "src6 fec0::2"
+ pgset "dst_mac  00:04:23:08:91:dc"
+
+# Time to run
+PGDEV=/proc/net/pktgen/pgctrl
+
+ echo "Running... ctrl^C to stop"
+ pgset "start"
+ echo "Done"
+
+# Result can be vieved in /proc/net/pktgen/eth1
-- 
cgit v1.2.3


From 865367db658f6f4d7b8280b0968b47e2cbddab90 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben.hutchings@codethink.co.uk>
Date: Tue, 24 Feb 2015 02:32:17 +0000
Subject: samples/pktgen: Delete unused function pg()

This function is not used and wouldn't do anything useful as
pktgen does not have an 'inject' command.

Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 samples/pktgen/pktgen.conf-1-1          | 5 -----
 samples/pktgen/pktgen.conf-1-1-flows    | 5 -----
 samples/pktgen/pktgen.conf-1-1-ip6      | 5 -----
 samples/pktgen/pktgen.conf-1-1-ip6-rdos | 5 -----
 samples/pktgen/pktgen.conf-1-1-rdos     | 5 -----
 samples/pktgen/pktgen.conf-1-2          | 5 -----
 samples/pktgen/pktgen.conf-2-1          | 5 -----
 samples/pktgen/pktgen.conf-2-2          | 5 -----
 8 files changed, 40 deletions(-)

(limited to 'samples/pktgen/pktgen.conf-1-1-ip6')

diff --git a/samples/pktgen/pktgen.conf-1-1 b/samples/pktgen/pktgen.conf-1-1
index 5d30f836ca3e..0a81c985129c 100755
--- a/samples/pktgen/pktgen.conf-1-1
+++ b/samples/pktgen/pktgen.conf-1-1
@@ -14,11 +14,6 @@ function pgset() {
     fi
 }
 
-function pg() {
-    echo inject > $PGDEV
-    cat $PGDEV
-}
-
 # Config Start Here -----------------------------------------------------------
 
 
diff --git a/samples/pktgen/pktgen.conf-1-1-flows b/samples/pktgen/pktgen.conf-1-1-flows
index 88a01b7d3531..872dcbadd6c3 100755
--- a/samples/pktgen/pktgen.conf-1-1-flows
+++ b/samples/pktgen/pktgen.conf-1-1-flows
@@ -14,11 +14,6 @@ function pgset() {
     fi
 }
 
-function pg() {
-    echo inject > $PGDEV
-    cat $PGDEV
-}
-
 # Config Start Here -----------------------------------------------------------
 
 
diff --git a/samples/pktgen/pktgen.conf-1-1-ip6 b/samples/pktgen/pktgen.conf-1-1-ip6
index 752f112bd9e6..cf0e86f8b43c 100755
--- a/samples/pktgen/pktgen.conf-1-1-ip6
+++ b/samples/pktgen/pktgen.conf-1-1-ip6
@@ -14,11 +14,6 @@ function pgset() {
     fi
 }
 
-function pg() {
-    echo inject > $PGDEV
-    cat $PGDEV
-}
-
 # Config Start Here -----------------------------------------------------------
 
 
diff --git a/samples/pktgen/pktgen.conf-1-1-ip6-rdos b/samples/pktgen/pktgen.conf-1-1-ip6-rdos
index fd364277e43f..799baeec0216 100755
--- a/samples/pktgen/pktgen.conf-1-1-ip6-rdos
+++ b/samples/pktgen/pktgen.conf-1-1-ip6-rdos
@@ -14,11 +14,6 @@ function pgset() {
     fi
 }
 
-function pg() {
-    echo inject > $PGDEV
-    cat $PGDEV
-}
-
 # Config Start Here -----------------------------------------------------------
 
 
diff --git a/samples/pktgen/pktgen.conf-1-1-rdos b/samples/pktgen/pktgen.conf-1-1-rdos
index bc81fa319243..e71f2818eef9 100755
--- a/samples/pktgen/pktgen.conf-1-1-rdos
+++ b/samples/pktgen/pktgen.conf-1-1-rdos
@@ -14,11 +14,6 @@ function pgset() {
     fi
 }
 
-function pg() {
-    echo inject > $PGDEV
-    cat $PGDEV
-}
-
 # Config Start Here -----------------------------------------------------------
 
 
diff --git a/samples/pktgen/pktgen.conf-1-2 b/samples/pktgen/pktgen.conf-1-2
index f99b88673860..7f6e88e53ffd 100755
--- a/samples/pktgen/pktgen.conf-1-2
+++ b/samples/pktgen/pktgen.conf-1-2
@@ -14,11 +14,6 @@ function pgset() {
     fi
 }
 
-function pg() {
-    echo inject > $PGDEV
-    cat $PGDEV
-}
-
 # Config Start Here -----------------------------------------------------------
 
 
diff --git a/samples/pktgen/pktgen.conf-2-1 b/samples/pktgen/pktgen.conf-2-1
index 845d7bf1609a..5e402cf9b0f5 100755
--- a/samples/pktgen/pktgen.conf-2-1
+++ b/samples/pktgen/pktgen.conf-2-1
@@ -14,11 +14,6 @@ function pgset() {
     fi
 }
 
-function pg() {
-    echo inject > $PGDEV
-    cat $PGDEV
-}
-
 # Config Start Here -----------------------------------------------------------
 
 
diff --git a/samples/pktgen/pktgen.conf-2-2 b/samples/pktgen/pktgen.conf-2-2
index 7ce86470a3a9..d63dc5f2112d 100755
--- a/samples/pktgen/pktgen.conf-2-2
+++ b/samples/pktgen/pktgen.conf-2-2
@@ -14,11 +14,6 @@ function pgset() {
     fi
 }
 
-function pg() {
-    echo inject > $PGDEV
-    cat $PGDEV
-}
-
 # Config Start Here -----------------------------------------------------------
 
 
-- 
cgit v1.2.3


From 2ad1cdf2ea5991b42b934d76c36113ceb4561fa6 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben.hutchings@codethink.co.uk>
Date: Tue, 24 Feb 2015 02:32:37 +0000
Subject: samples/pktgen: Correct comments about the thread config

They all claimed to be two CPU examples using eth1, eth2 but
that is only true in one case!

Rob Jones pointed out spelling and grammar errors here, which I've
also corrected.

Cc: Rob Jones <rob.jones@codethink.co.uk>
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 samples/pktgen/pktgen.conf-1-1          | 2 +-
 samples/pktgen/pktgen.conf-1-1-flows    | 2 +-
 samples/pktgen/pktgen.conf-1-1-ip6      | 2 +-
 samples/pktgen/pktgen.conf-1-1-ip6-rdos | 2 +-
 samples/pktgen/pktgen.conf-1-1-rdos     | 2 +-
 samples/pktgen/pktgen.conf-1-2          | 2 +-
 samples/pktgen/pktgen.conf-2-1          | 3 ++-
 samples/pktgen/pktgen.conf-2-2          | 2 +-
 8 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'samples/pktgen/pktgen.conf-1-1-ip6')

diff --git a/samples/pktgen/pktgen.conf-1-1 b/samples/pktgen/pktgen.conf-1-1
index 0a81c985129c..79462adad05d 100755
--- a/samples/pktgen/pktgen.conf-1-1
+++ b/samples/pktgen/pktgen.conf-1-1
@@ -18,7 +18,7 @@ function pgset() {
 
 
 # thread config
-# Each CPU has own thread. Two CPU exammple. We add eth1, eth2 respectivly.
+# Each CPU has its own thread. One CPU example. We add eth1.
 
 PGDEV=/proc/net/pktgen/kpktgend_0
   echo "Removing all devices"
diff --git a/samples/pktgen/pktgen.conf-1-1-flows b/samples/pktgen/pktgen.conf-1-1-flows
index 872dcbadd6c3..629ac3eaee35 100755
--- a/samples/pktgen/pktgen.conf-1-1-flows
+++ b/samples/pktgen/pktgen.conf-1-1-flows
@@ -18,7 +18,7 @@ function pgset() {
 
 
 # thread config
-# Each CPU has own thread. Two CPU exammple. We add eth1, eth2 respectivly.
+# Each CPU has its own thread. One CPU example. We add eth1.
 
 PGDEV=/proc/net/pktgen/kpktgend_0
   echo "Removing all devices"
diff --git a/samples/pktgen/pktgen.conf-1-1-ip6 b/samples/pktgen/pktgen.conf-1-1-ip6
index cf0e86f8b43c..c392475d60cf 100755
--- a/samples/pktgen/pktgen.conf-1-1-ip6
+++ b/samples/pktgen/pktgen.conf-1-1-ip6
@@ -18,7 +18,7 @@ function pgset() {
 
 
 # thread config
-# Each CPU has own thread. Two CPU exammple. We add eth1, eth2 respectivly.
+# Each CPU has its own thread. One CPU example. We add eth1.
 # IPv6. Note increase in minimal packet length
 
 PGDEV=/proc/net/pktgen/kpktgend_0
diff --git a/samples/pktgen/pktgen.conf-1-1-ip6-rdos b/samples/pktgen/pktgen.conf-1-1-ip6-rdos
index 799baeec0216..220d276f033a 100755
--- a/samples/pktgen/pktgen.conf-1-1-ip6-rdos
+++ b/samples/pktgen/pktgen.conf-1-1-ip6-rdos
@@ -18,7 +18,7 @@ function pgset() {
 
 
 # thread config
-# Each CPU has own thread. Two CPU exammple. We add eth1, eth2 respectivly.
+# Each CPU has its own thread. One CPU example. We add eth1.
 # IPv6. Note increase in minimal packet length
 
 PGDEV=/proc/net/pktgen/kpktgend_0
diff --git a/samples/pktgen/pktgen.conf-1-1-rdos b/samples/pktgen/pktgen.conf-1-1-rdos
index e71f2818eef9..6013975d26d9 100755
--- a/samples/pktgen/pktgen.conf-1-1-rdos
+++ b/samples/pktgen/pktgen.conf-1-1-rdos
@@ -18,7 +18,7 @@ function pgset() {
 
 
 # thread config
-# Each CPU has own thread. Two CPU exammple. We add eth1, eth2 respectivly.
+# Each CPU has its own thread. One CPU example. We add eth1.
 
 PGDEV=/proc/net/pktgen/kpktgend_0
   echo "Removing all devices"
diff --git a/samples/pktgen/pktgen.conf-1-2 b/samples/pktgen/pktgen.conf-1-2
index 7f6e88e53ffd..136e10caff63 100755
--- a/samples/pktgen/pktgen.conf-1-2
+++ b/samples/pktgen/pktgen.conf-1-2
@@ -18,7 +18,7 @@ function pgset() {
 
 
 # thread config
-# One CPU means one thread. One CPU exammple. We add eth1, eth2 respectivly.
+# One CPU means one thread. One CPU example. We add eth1, eth2 respectivly.
 
 PGDEV=/proc/net/pktgen/kpktgend_0
   echo "Removing all devices"
diff --git a/samples/pktgen/pktgen.conf-2-1 b/samples/pktgen/pktgen.conf-2-1
index 5e402cf9b0f5..ccd32780bed1 100755
--- a/samples/pktgen/pktgen.conf-2-1
+++ b/samples/pktgen/pktgen.conf-2-1
@@ -18,7 +18,8 @@ function pgset() {
 
 
 # thread config
-# Each CPU has own thread. Two CPU exammple. We add eth1, eth2 respectivly.
+# Each CPU has its own thread. Two CPU example. We add eth1 to the first
+# and leave the second idle.
 
 PGDEV=/proc/net/pktgen/kpktgend_0
   echo "Removing all devices"
diff --git a/samples/pktgen/pktgen.conf-2-2 b/samples/pktgen/pktgen.conf-2-2
index d63dc5f2112d..49ae4cf2bb76 100755
--- a/samples/pktgen/pktgen.conf-2-2
+++ b/samples/pktgen/pktgen.conf-2-2
@@ -18,7 +18,7 @@ function pgset() {
 
 
 # thread config
-# Each CPU has own thread. Two CPU exammple. We add eth1, eth2 respectivly.
+# Each CPU has its own thread. Two CPU example. We add eth1, eth2 respectively.
 
 PGDEV=/proc/net/pktgen/kpktgend_0
   echo "Removing all devices"
-- 
cgit v1.2.3


From 06481f22c6fa5a85445770d5adceb261cac6620f Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben.hutchings@codethink.co.uk>
Date: Tue, 24 Feb 2015 02:32:48 +0000
Subject: samples/pktgen: Remove setting of obsolete max_before_softirq
 parameter

Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 samples/pktgen/pktgen.conf-1-1          | 2 --
 samples/pktgen/pktgen.conf-1-1-flows    | 2 --
 samples/pktgen/pktgen.conf-1-1-ip6      | 2 --
 samples/pktgen/pktgen.conf-1-1-ip6-rdos | 2 --
 samples/pktgen/pktgen.conf-1-1-rdos     | 2 --
 samples/pktgen/pktgen.conf-1-2          | 2 --
 samples/pktgen/pktgen.conf-2-1          | 2 --
 samples/pktgen/pktgen.conf-2-2          | 4 ----
 8 files changed, 18 deletions(-)

(limited to 'samples/pktgen/pktgen.conf-1-1-ip6')

diff --git a/samples/pktgen/pktgen.conf-1-1 b/samples/pktgen/pktgen.conf-1-1
index 79462adad05d..e32782e06caf 100755
--- a/samples/pktgen/pktgen.conf-1-1
+++ b/samples/pktgen/pktgen.conf-1-1
@@ -25,8 +25,6 @@ PGDEV=/proc/net/pktgen/kpktgend_0
  pgset "rem_device_all"
   echo "Adding eth1"
  pgset "add_device eth1"
-  echo "Setting max_before_softirq 10000"
- pgset "max_before_softirq 10000"
 
 
 # device config
diff --git a/samples/pktgen/pktgen.conf-1-1-flows b/samples/pktgen/pktgen.conf-1-1-flows
index 629ac3eaee35..ea859e441f6e 100755
--- a/samples/pktgen/pktgen.conf-1-1-flows
+++ b/samples/pktgen/pktgen.conf-1-1-flows
@@ -25,8 +25,6 @@ PGDEV=/proc/net/pktgen/kpktgend_0
  pgset "rem_device_all"
   echo "Adding eth1"
  pgset "add_device eth1"
-  echo "Setting max_before_softirq 10000"
- pgset "max_before_softirq 10000"
 
 
 # device config
diff --git a/samples/pktgen/pktgen.conf-1-1-ip6 b/samples/pktgen/pktgen.conf-1-1-ip6
index c392475d60cf..0a81fd92426b 100755
--- a/samples/pktgen/pktgen.conf-1-1-ip6
+++ b/samples/pktgen/pktgen.conf-1-1-ip6
@@ -26,8 +26,6 @@ PGDEV=/proc/net/pktgen/kpktgend_0
  pgset "rem_device_all"
   echo "Adding eth1"
  pgset "add_device eth1"
-  echo "Setting max_before_softirq 10000"
- pgset "max_before_softirq 10000"
 
 
 # device config
diff --git a/samples/pktgen/pktgen.conf-1-1-ip6-rdos b/samples/pktgen/pktgen.conf-1-1-ip6-rdos
index 220d276f033a..21c3b1589fa7 100755
--- a/samples/pktgen/pktgen.conf-1-1-ip6-rdos
+++ b/samples/pktgen/pktgen.conf-1-1-ip6-rdos
@@ -26,8 +26,6 @@ PGDEV=/proc/net/pktgen/kpktgend_0
  pgset "rem_device_all"
   echo "Adding eth1"
  pgset "add_device eth1"
-  echo "Setting max_before_softirq 10000"
- pgset "max_before_softirq 10000"
 
 
 # device config
diff --git a/samples/pktgen/pktgen.conf-1-1-rdos b/samples/pktgen/pktgen.conf-1-1-rdos
index 6013975d26d9..fc4e345c4a34 100755
--- a/samples/pktgen/pktgen.conf-1-1-rdos
+++ b/samples/pktgen/pktgen.conf-1-1-rdos
@@ -25,8 +25,6 @@ PGDEV=/proc/net/pktgen/kpktgend_0
  pgset "rem_device_all"
   echo "Adding eth1"
  pgset "add_device eth1"
-  echo "Setting max_before_softirq 10000"
- pgset "max_before_softirq 10000"
 
 
 # device config
diff --git a/samples/pktgen/pktgen.conf-1-2 b/samples/pktgen/pktgen.conf-1-2
index 136e10caff63..dfea8e6896d4 100755
--- a/samples/pktgen/pktgen.conf-1-2
+++ b/samples/pktgen/pktgen.conf-1-2
@@ -27,8 +27,6 @@ PGDEV=/proc/net/pktgen/kpktgend_0
  pgset "add_device eth1"
   echo "Adding eth2"
  pgset "add_device eth2"
-  echo "Setting max_before_softirq 10000"
- pgset "max_before_softirq 10000"
 
 
 # device config
diff --git a/samples/pktgen/pktgen.conf-2-1 b/samples/pktgen/pktgen.conf-2-1
index ccd32780bed1..5d2fe4cdbd96 100755
--- a/samples/pktgen/pktgen.conf-2-1
+++ b/samples/pktgen/pktgen.conf-2-1
@@ -26,8 +26,6 @@ PGDEV=/proc/net/pktgen/kpktgend_0
  pgset "rem_device_all"
   echo "Adding eth1"
  pgset "add_device eth1"
-  echo "Setting max_before_softirq 10000"
- pgset "max_before_softirq 10000"
 
 # We need to remove old config since we dont use this thread. We can only
 # one NIC on one CPU due to affinity reasons.
diff --git a/samples/pktgen/pktgen.conf-2-2 b/samples/pktgen/pktgen.conf-2-2
index 49ae4cf2bb76..474f200edcfb 100755
--- a/samples/pktgen/pktgen.conf-2-2
+++ b/samples/pktgen/pktgen.conf-2-2
@@ -25,16 +25,12 @@ PGDEV=/proc/net/pktgen/kpktgend_0
  pgset "rem_device_all"
   echo "Adding eth1"
  pgset "add_device eth1"
-  echo "Setting max_before_softirq 10000"
- pgset "max_before_softirq 10000"
 
 PGDEV=/proc/net/pktgen/kpktgend_1
   echo "Removing all devices"
  pgset "rem_device_all"
   echo "Adding eth2"
  pgset "add_device eth2"
-  echo "Setting max_before_softirq 10000"
- pgset "max_before_softirq 10000"
 
 
 # device config
-- 
cgit v1.2.3


From db72aba30a4f4c15eb20066f1d9c1bcbcf419236 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben.hutchings@codethink.co.uk>
Date: Tue, 24 Feb 2015 02:32:59 +0000
Subject: samples/pktgen: Use bash as interpreter

These scripts use the non-POSIX 'function' and 'local' keywords so
they won't work with every /bin/sh.  We could drop 'function' as it is
a no-op, but 'local' makes for cleaner scripts.  Require use of bash.

Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 samples/pktgen/pktgen.conf-1-1          | 2 +-
 samples/pktgen/pktgen.conf-1-1-flows    | 2 +-
 samples/pktgen/pktgen.conf-1-1-ip6      | 2 +-
 samples/pktgen/pktgen.conf-1-1-ip6-rdos | 2 +-
 samples/pktgen/pktgen.conf-1-1-rdos     | 2 +-
 samples/pktgen/pktgen.conf-1-2          | 2 +-
 samples/pktgen/pktgen.conf-2-1          | 2 +-
 samples/pktgen/pktgen.conf-2-2          | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'samples/pktgen/pktgen.conf-1-1-ip6')

diff --git a/samples/pktgen/pktgen.conf-1-1 b/samples/pktgen/pktgen.conf-1-1
index e32782e06caf..bb5398367d4b 100755
--- a/samples/pktgen/pktgen.conf-1-1
+++ b/samples/pktgen/pktgen.conf-1-1
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
 
 #modprobe pktgen
 
diff --git a/samples/pktgen/pktgen.conf-1-1-flows b/samples/pktgen/pktgen.conf-1-1-flows
index ea859e441f6e..db20ac8a66a7 100755
--- a/samples/pktgen/pktgen.conf-1-1-flows
+++ b/samples/pktgen/pktgen.conf-1-1-flows
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
 
 #modprobe pktgen
 
diff --git a/samples/pktgen/pktgen.conf-1-1-ip6 b/samples/pktgen/pktgen.conf-1-1-ip6
index 0a81fd92426b..e22199d1ed76 100755
--- a/samples/pktgen/pktgen.conf-1-1-ip6
+++ b/samples/pktgen/pktgen.conf-1-1-ip6
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
 
 #modprobe pktgen
 
diff --git a/samples/pktgen/pktgen.conf-1-1-ip6-rdos b/samples/pktgen/pktgen.conf-1-1-ip6-rdos
index 21c3b1589fa7..58dd0524f264 100755
--- a/samples/pktgen/pktgen.conf-1-1-ip6-rdos
+++ b/samples/pktgen/pktgen.conf-1-1-ip6-rdos
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
 
 #modprobe pktgen
 
diff --git a/samples/pktgen/pktgen.conf-1-1-rdos b/samples/pktgen/pktgen.conf-1-1-rdos
index fc4e345c4a34..2834ac789721 100755
--- a/samples/pktgen/pktgen.conf-1-1-rdos
+++ b/samples/pktgen/pktgen.conf-1-1-rdos
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
 
 #modprobe pktgen
 
diff --git a/samples/pktgen/pktgen.conf-1-2 b/samples/pktgen/pktgen.conf-1-2
index dfea8e6896d4..b519dab262ce 100755
--- a/samples/pktgen/pktgen.conf-1-2
+++ b/samples/pktgen/pktgen.conf-1-2
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
 
 #modprobe pktgen
 
diff --git a/samples/pktgen/pktgen.conf-2-1 b/samples/pktgen/pktgen.conf-2-1
index 5d2fe4cdbd96..6f57a558d817 100755
--- a/samples/pktgen/pktgen.conf-2-1
+++ b/samples/pktgen/pktgen.conf-2-1
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
 
 #modprobe pktgen
 
diff --git a/samples/pktgen/pktgen.conf-2-2 b/samples/pktgen/pktgen.conf-2-2
index 474f200edcfb..aa3225280521 100755
--- a/samples/pktgen/pktgen.conf-2-2
+++ b/samples/pktgen/pktgen.conf-2-2
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
 
 #modprobe pktgen
 
-- 
cgit v1.2.3


From 16b5d0c4a24c793ca3584ca5c50fd5f8f2166120 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben.hutchings@codethink.co.uk>
Date: Tue, 24 Feb 2015 02:33:08 +0000
Subject: samples/pktgen: Trap SIGINT

Otherwise ^C stops the script, not just pktgen.

Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 samples/pktgen/pktgen.conf-1-1          | 1 +
 samples/pktgen/pktgen.conf-1-1-flows    | 1 +
 samples/pktgen/pktgen.conf-1-1-ip6      | 1 +
 samples/pktgen/pktgen.conf-1-1-ip6-rdos | 1 +
 samples/pktgen/pktgen.conf-1-1-rdos     | 1 +
 samples/pktgen/pktgen.conf-1-2          | 1 +
 samples/pktgen/pktgen.conf-2-1          | 1 +
 samples/pktgen/pktgen.conf-2-2          | 1 +
 8 files changed, 8 insertions(+)

(limited to 'samples/pktgen/pktgen.conf-1-1-ip6')

diff --git a/samples/pktgen/pktgen.conf-1-1 b/samples/pktgen/pktgen.conf-1-1
index bb5398367d4b..fc1d15c98595 100755
--- a/samples/pktgen/pktgen.conf-1-1
+++ b/samples/pktgen/pktgen.conf-1-1
@@ -53,6 +53,7 @@ PGDEV=/proc/net/pktgen/eth1
 PGDEV=/proc/net/pktgen/pgctrl
 
  echo "Running... ctrl^C to stop"
+ trap true INT
  pgset "start"
  echo "Done"
 
diff --git a/samples/pktgen/pktgen.conf-1-1-flows b/samples/pktgen/pktgen.conf-1-1-flows
index db20ac8a66a7..e00d66c8f5e5 100755
--- a/samples/pktgen/pktgen.conf-1-1-flows
+++ b/samples/pktgen/pktgen.conf-1-1-flows
@@ -61,6 +61,7 @@ PGDEV=/proc/net/pktgen/eth1
 PGDEV=/proc/net/pktgen/pgctrl
 
  echo "Running... ctrl^C to stop"
+ trap true INT
  pgset "start"
  echo "Done"
 
diff --git a/samples/pktgen/pktgen.conf-1-1-ip6 b/samples/pktgen/pktgen.conf-1-1-ip6
index e22199d1ed76..f16145303afb 100755
--- a/samples/pktgen/pktgen.conf-1-1-ip6
+++ b/samples/pktgen/pktgen.conf-1-1-ip6
@@ -54,6 +54,7 @@ PGDEV=/proc/net/pktgen/eth1
 PGDEV=/proc/net/pktgen/pgctrl
 
  echo "Running... ctrl^C to stop"
+ trap true INT
  pgset "start"
  echo "Done"
 
diff --git a/samples/pktgen/pktgen.conf-1-1-ip6-rdos b/samples/pktgen/pktgen.conf-1-1-ip6-rdos
index 58dd0524f264..06b502834cc7 100755
--- a/samples/pktgen/pktgen.conf-1-1-ip6-rdos
+++ b/samples/pktgen/pktgen.conf-1-1-ip6-rdos
@@ -57,6 +57,7 @@ PGDEV=/proc/net/pktgen/eth1
 PGDEV=/proc/net/pktgen/pgctrl
 
  echo "Running... ctrl^C to stop"
+ trap true INT
  pgset "start"
  echo "Done"
 
diff --git a/samples/pktgen/pktgen.conf-1-1-rdos b/samples/pktgen/pktgen.conf-1-1-rdos
index 2834ac789721..8f1ce1a0aa98 100755
--- a/samples/pktgen/pktgen.conf-1-1-rdos
+++ b/samples/pktgen/pktgen.conf-1-1-rdos
@@ -58,6 +58,7 @@ PGDEV=/proc/net/pktgen/eth1
 PGDEV=/proc/net/pktgen/pgctrl
 
  echo "Running... ctrl^C to stop"
+ trap true INT
  pgset "start"
  echo "Done"
 
diff --git a/samples/pktgen/pktgen.conf-1-2 b/samples/pktgen/pktgen.conf-1-2
index b519dab262ce..f151e85c536a 100755
--- a/samples/pktgen/pktgen.conf-1-2
+++ b/samples/pktgen/pktgen.conf-1-2
@@ -63,6 +63,7 @@ PGDEV=/proc/net/pktgen/eth2
 PGDEV=/proc/net/pktgen/pgctrl
 
  echo "Running... ctrl^C to stop"
+ trap true INT
  pgset "start"
  echo "Done"
 
diff --git a/samples/pktgen/pktgen.conf-2-1 b/samples/pktgen/pktgen.conf-2-1
index 6f57a558d817..e6b36b2f840e 100755
--- a/samples/pktgen/pktgen.conf-2-1
+++ b/samples/pktgen/pktgen.conf-2-1
@@ -60,6 +60,7 @@ PGDEV=/proc/net/pktgen/eth1
 PGDEV=/proc/net/pktgen/pgctrl
 
  echo "Running... ctrl^C to stop"
+ trap true INT
  pgset "start"
  echo "Done"
 
diff --git a/samples/pktgen/pktgen.conf-2-2 b/samples/pktgen/pktgen.conf-2-2
index aa3225280521..6484435c104e 100755
--- a/samples/pktgen/pktgen.conf-2-2
+++ b/samples/pktgen/pktgen.conf-2-2
@@ -67,6 +67,7 @@ PGDEV=/proc/net/pktgen/eth2
 PGDEV=/proc/net/pktgen/pgctrl
 
  echo "Running... ctrl^C to stop"
+ trap true INT
  pgset "start"
  echo "Done"
 
-- 
cgit v1.2.3


From 4062bd25f0be9bd2dae25992ad87247ac4f73df3 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben.hutchings@codethink.co.uk>
Date: Tue, 24 Feb 2015 02:33:20 +0000
Subject: samples/pktgen: Show the results rather than just commenting where
 they are

Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 samples/pktgen/pktgen.conf-1-1          | 3 +--
 samples/pktgen/pktgen.conf-1-1-flows    | 3 +--
 samples/pktgen/pktgen.conf-1-1-ip6      | 3 +--
 samples/pktgen/pktgen.conf-1-1-ip6-rdos | 3 +--
 samples/pktgen/pktgen.conf-1-1-rdos     | 3 +--
 samples/pktgen/pktgen.conf-1-2          | 3 +--
 samples/pktgen/pktgen.conf-2-1          | 3 +--
 samples/pktgen/pktgen.conf-2-2          | 3 +--
 8 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'samples/pktgen/pktgen.conf-1-1-ip6')

diff --git a/samples/pktgen/pktgen.conf-1-1 b/samples/pktgen/pktgen.conf-1-1
index fc1d15c98595..f91daad9e916 100755
--- a/samples/pktgen/pktgen.conf-1-1
+++ b/samples/pktgen/pktgen.conf-1-1
@@ -56,5 +56,4 @@ PGDEV=/proc/net/pktgen/pgctrl
  trap true INT
  pgset "start"
  echo "Done"
-
-# Result can be vieved in /proc/net/pktgen/eth1
+ cat /proc/net/pktgen/eth1
diff --git a/samples/pktgen/pktgen.conf-1-1-flows b/samples/pktgen/pktgen.conf-1-1-flows
index e00d66c8f5e5..081749c9707d 100755
--- a/samples/pktgen/pktgen.conf-1-1-flows
+++ b/samples/pktgen/pktgen.conf-1-1-flows
@@ -64,5 +64,4 @@ PGDEV=/proc/net/pktgen/pgctrl
  trap true INT
  pgset "start"
  echo "Done"
-
-# Result can be vieved in /proc/net/pktgen/eth1
+ cat /proc/net/pktgen/eth1
diff --git a/samples/pktgen/pktgen.conf-1-1-ip6 b/samples/pktgen/pktgen.conf-1-1-ip6
index f16145303afb..0b9ffd47fd41 100755
--- a/samples/pktgen/pktgen.conf-1-1-ip6
+++ b/samples/pktgen/pktgen.conf-1-1-ip6
@@ -57,5 +57,4 @@ PGDEV=/proc/net/pktgen/pgctrl
  trap true INT
  pgset "start"
  echo "Done"
-
-# Result can be vieved in /proc/net/pktgen/eth1
+ cat /proc/net/pktgen/eth1
diff --git a/samples/pktgen/pktgen.conf-1-1-ip6-rdos b/samples/pktgen/pktgen.conf-1-1-ip6-rdos
index 06b502834cc7..ad98e5f40776 100755
--- a/samples/pktgen/pktgen.conf-1-1-ip6-rdos
+++ b/samples/pktgen/pktgen.conf-1-1-ip6-rdos
@@ -60,5 +60,4 @@ PGDEV=/proc/net/pktgen/pgctrl
  trap true INT
  pgset "start"
  echo "Done"
-
-# Result can be vieved in /proc/net/pktgen/eth1
+ cat /proc/net/pktgen/eth1
diff --git a/samples/pktgen/pktgen.conf-1-1-rdos b/samples/pktgen/pktgen.conf-1-1-rdos
index 8f1ce1a0aa98..c7553be49b80 100755
--- a/samples/pktgen/pktgen.conf-1-1-rdos
+++ b/samples/pktgen/pktgen.conf-1-1-rdos
@@ -61,5 +61,4 @@ PGDEV=/proc/net/pktgen/pgctrl
  trap true INT
  pgset "start"
  echo "Done"
-
-# Result can be vieved in /proc/net/pktgen/eth1
+ cat /proc/net/pktgen/eth1
diff --git a/samples/pktgen/pktgen.conf-1-2 b/samples/pktgen/pktgen.conf-1-2
index f151e85c536a..ba4eb26e168d 100755
--- a/samples/pktgen/pktgen.conf-1-2
+++ b/samples/pktgen/pktgen.conf-1-2
@@ -66,5 +66,4 @@ PGDEV=/proc/net/pktgen/pgctrl
  trap true INT
  pgset "start"
  echo "Done"
-
-# Result can be vieved in /proc/net/pktgen/eth[1,2]
+ cat /proc/net/pktgen/eth1 /proc/net/pktgen/eth2
diff --git a/samples/pktgen/pktgen.conf-2-1 b/samples/pktgen/pktgen.conf-2-1
index e6b36b2f840e..e108e97d6d89 100755
--- a/samples/pktgen/pktgen.conf-2-1
+++ b/samples/pktgen/pktgen.conf-2-1
@@ -63,5 +63,4 @@ PGDEV=/proc/net/pktgen/pgctrl
  trap true INT
  pgset "start"
  echo "Done"
-
-# Result can be vieved in /proc/net/pktgen/eth1
+ cat /proc/net/pktgen/eth1
diff --git a/samples/pktgen/pktgen.conf-2-2 b/samples/pktgen/pktgen.conf-2-2
index 6484435c104e..acea15503e71 100755
--- a/samples/pktgen/pktgen.conf-2-2
+++ b/samples/pktgen/pktgen.conf-2-2
@@ -70,5 +70,4 @@ PGDEV=/proc/net/pktgen/pgctrl
  trap true INT
  pgset "start"
  echo "Done"
-
-# Result can be vieved in /proc/net/pktgen/eth[1,2]
+ cat /proc/net/pktgen/eth1 /proc/net/pktgen/eth2
-- 
cgit v1.2.3