selftests: forwarding: lib: Move here vlan_capture_{, un}install()

Move vlan_capture_install() and vlan_capture_uninstall() from
mirror_vlan.sh test to lib.sh so that it can be reused in other tests.

Signed-off-by: Petr Machata <petrm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh
index 89ba4cdd43928d8af9f36a27757d8d6220b1fa54..7b18a53aa55665a2a979ee895cc03c968107f5eb 100644 (file)
--- a/tools/testing/selftests/net/forwarding/lib.sh
+++ b/tools/testing/selftests/net/forwarding/lib.sh
@@ -514,6 +514,29 @@ icmp6_capture_uninstall()
        __icmp_capture_add_del del 100 v6 "$@"
 }
 
+__vlan_capture_add_del()
+{
+       local add_del=$1; shift
+       local pref=$1; shift
+       local dev=$1; shift
+       local filter=$1; shift
+
+       tc filter $add_del dev "$dev" ingress \
+          proto 802.1q pref $pref \
+          flower $filter \
+          action pass
+}
+
+vlan_capture_install()
+{
+       __vlan_capture_add_del add 100 "$@"
+}
+
+vlan_capture_uninstall()
+{
+       __vlan_capture_add_del del 100 "$@"
+}
+
 matchall_sink_create()
 {
        local dev=$1; shift

diff --git a/tools/testing/selftests/net/forwarding/mirror_vlan.sh b/tools/testing/selftests/net/forwarding/mirror_vlan.sh
index 1e10520dccf49751122f002d970267ffd94b2382..758b6d027971f354d36b8fa8b6d8e105e6d2a7ee 100755 (executable)
--- a/tools/testing/selftests/net/forwarding/mirror_vlan.sh
+++ b/tools/testing/selftests/net/forwarding/mirror_vlan.sh
@@ -76,29 +76,6 @@ test_vlan()
        test_vlan_dir egress 0 8
 }
 
-vlan_capture_add_del()
-{
-       local add_del=$1; shift
-       local pref=$1; shift
-       local dev=$1; shift
-       local filter=$1; shift
-
-       tc filter $add_del dev "$dev" ingress \
-          proto 802.1q pref $pref \
-          flower $filter \
-          action pass
-}
-
-vlan_capture_install()
-{
-       vlan_capture_add_del add 100 "$@"
-}
-
-vlan_capture_uninstall()
-{
-       vlan_capture_add_del del 100 "$@"
-}
-
 do_test_span_vlan_dir_ips()
 {
        local expect=$1; shift