selftests: forwarding: ethtool: Move different_speeds_get() to ethtool_lib

Currently different_speeds_get() is used only by ethtool.sh tests.
The function can be useful for another tests that check ethtool
configurations.

Move the function to ethtool_lib in order to allow other tests to use
it.

Signed-off-by: Amit Cohen <amitc@mellanox.com>
Reviewed-by: Petr Machata <petrm@mellanox.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/testing/selftests/net/forwarding/ethtool.sh b/tools/testing/selftests/net/forwarding/ethtool.sh
index eb8e2a23bbb4c7d64dc4473db309024c20124b86..ea7a11a9f7881962351d9e39b6a94e84aaa377d6 100755 (executable)
--- a/tools/testing/selftests/net/forwarding/ethtool.sh
+++ b/tools/testing/selftests/net/forwarding/ethtool.sh
@@ -50,23 +50,6 @@ cleanup()
        h1_destroy
 }
 
-different_speeds_get()
-{
-       local dev1=$1; shift
-       local dev2=$1; shift
-       local with_mode=$1; shift
-       local adver=$1; shift
-
-       local -a speeds_arr
-
-       speeds_arr=($(common_speeds_get $dev1 $dev2 $with_mode $adver))
-       if [[ ${#speeds_arr[@]} < 2 ]]; then
-               check_err 1 "cannot check different speeds. There are not enough speeds"
-       fi
-
-       echo ${speeds_arr[0]} ${speeds_arr[1]}
-}
-
 same_speeds_autoneg_off()
 {
        # Check that when each of the reported speeds is forced, the links come

diff --git a/tools/testing/selftests/net/forwarding/ethtool_lib.sh b/tools/testing/selftests/net/forwarding/ethtool_lib.sh
index 925d229a59d82a74618b608a015bd774990a2d66..9188e624dec0736e0dfe57d0aeabad9a9c50984f 100644 (file)
--- a/tools/testing/selftests/net/forwarding/ethtool_lib.sh
+++ b/tools/testing/selftests/net/forwarding/ethtool_lib.sh
@@ -67,3 +67,20 @@ common_speeds_get()
                <(printf '%s\n' "${dev1_speeds[@]}" | sort -u) \
                <(printf '%s\n' "${dev2_speeds[@]}" | sort -u)
 }
+
+different_speeds_get()
+{
+       local dev1=$1; shift
+       local dev2=$1; shift
+       local with_mode=$1; shift
+       local adver=$1; shift
+
+       local -a speeds_arr
+
+       speeds_arr=($(common_speeds_get $dev1 $dev2 $with_mode $adver))
+       if [[ ${#speeds_arr[@]} < 2 ]]; then
+               check_err 1 "cannot check different speeds. There are not enough speeds"
+       fi
+
+       echo ${speeds_arr[0]} ${speeds_arr[1]}
+}