selftests: forwarding: Move start_/stop_traffic from mlxsw to lib.sh

These two functions are used for starting several streams of traffic, and
then stopping them later. They will be handy for the test coverage of ETS
Qdisc. Move them from mlxsw-specific qos_lib.sh to the generic lib.sh.

Signed-off-by: Petr Machata <petrm@mellanox.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/testing/selftests/drivers/net/mlxsw/qos_lib.sh b/tools/testing/selftests/drivers/net/mlxsw/qos_lib.sh
index e80be65..75a3fb3 100644 (file)
--- a/tools/testing/selftests/drivers/net/mlxsw/qos_lib.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/qos_lib.sh
@@ -24,24 +24,6 @@ rate()
        echo $((8 * (t1 - t0) / interval))
 }
 
-start_traffic()
-{
-       local h_in=$1; shift    # Where the traffic egresses the host
-       local sip=$1; shift
-       local dip=$1; shift
-       local dmac=$1; shift
-
-       $MZ $h_in -p 8000 -A $sip -B $dip -c 0 \
-               -a own -b $dmac -t udp -q &
-       sleep 1
-}
-
-stop_traffic()
-{
-       # Suppress noise from killing mausezahn.
-       { kill %% && wait %%; } 2>/dev/null
-}
-
 check_rate()
 {
        local rate=$1; shift

diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh
index 1f64e73..a0b09bb 100644 (file)
--- a/tools/testing/selftests/net/forwarding/lib.sh
+++ b/tools/testing/selftests/net/forwarding/lib.sh
@@ -1065,3 +1065,21 @@ flood_test()
        flood_unicast_test $br_port $host1_if $host2_if
        flood_multicast_test $br_port $host1_if $host2_if
 }
+
+start_traffic()
+{
+       local h_in=$1; shift    # Where the traffic egresses the host
+       local sip=$1; shift
+       local dip=$1; shift
+       local dmac=$1; shift
+
+       $MZ $h_in -p 8000 -A $sip -B $dip -c 0 \
+               -a own -b $dmac -t udp -q &
+       sleep 1
+}
+
+stop_traffic()
+{
+       # Suppress noise from killing mausezahn.
+       { kill %% && wait %%; } 2>/dev/null
+}