Merge branch 'selftests-mirror_vlan-fixes'

Petr Machata says:

====================
selftests: forwarding: mirror_vlan: Fixlets

This patchset includes two small fixes for the tests that were
introduced in commit 1bb58d2d ("Merge branch
'Mirroring-tests-involving-VLAN'").

In patch #1, a "tc action trap" is uninstalled after the suite runs,
instead of being installed again.

In patch #2, a test in suite is renamed to differentiate it from another
test of the same name.
====================
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

tools/testing/selftests/net/forwarding/mirror_vlan.sh

@@ -91,7 +91,7 @@ test_tagged_vlan_dir()
 				  192.0.2.17 192.0.2.18
 	mirror_uninstall $swp1 $direction
 
-	log_test "$direction mirror to vlan ($tcflags)"
+	log_test "$direction mirror tagged to vlan ($tcflags)"
 }
 
 test_tagged_vlan()
@@ -108,7 +108,7 @@ test_all()
 
 	tests_run
 
-	trap_install $h3 ingress
+	trap_uninstall $h3 ingress
 	slow_path_trap_uninstall $swp1 egress
 	slow_path_trap_uninstall $swp1 ingress
 }