Rename this function to mark it as autodefer. For details, see the discussion in the cover letter.
Signed-off-by: Petr Machata <[email protected]> --- .../selftests/net/forwarding/bridge_fdb_local_vlan_0.sh | 8 ++++---- tools/testing/selftests/net/forwarding/vxlan_reserved.sh | 2 +- tools/testing/selftests/net/lib.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/forwarding/bridge_fdb_local_vlan_0.sh b/tools/testing/selftests/net/forwarding/bridge_fdb_local_vlan_0.sh index 868f2fa5f9d2..b8fd85a20b78 100755 --- a/tools/testing/selftests/net/forwarding/bridge_fdb_local_vlan_0.sh +++ b/tools/testing/selftests/net/forwarding/bridge_fdb_local_vlan_0.sh @@ -47,8 +47,8 @@ host_create() simple_if_init "$h" "$ipv4" "$ipv6" defer simple_if_fini "$h" "$ipv4" "$ipv6" - ip_route_add vrf "v$h" 192.0.2.16/28 nexthop via 192.0.2.3 - ip_route_add vrf "v$h" 2001:db8:2::/64 nexthop via 2001:db8:1::3 + adf_ip_route_add vrf "v$h" 192.0.2.16/28 nexthop via 192.0.2.3 + adf_ip_route_add vrf "v$h" 2001:db8:2::/64 nexthop via 2001:db8:1::3 } h3_create() @@ -56,8 +56,8 @@ h3_create() simple_if_init "$h3" 192.0.2.18/28 2001:db8:2::2/64 defer simple_if_fini "$h3" 192.0.2.18/28 2001:db8:2::2/64 - ip_route_add vrf "v$h3" 192.0.2.0/28 nexthop via 192.0.2.17 - ip_route_add vrf "v$h3" 2001:db8:1::/64 nexthop via 2001:db8:2::1 + adf_ip_route_add vrf "v$h3" 192.0.2.0/28 nexthop via 192.0.2.17 + adf_ip_route_add vrf "v$h3" 2001:db8:1::/64 nexthop via 2001:db8:2::1 tc qdisc add dev "$h3" clsact defer tc qdisc del dev "$h3" clsact diff --git a/tools/testing/selftests/net/forwarding/vxlan_reserved.sh b/tools/testing/selftests/net/forwarding/vxlan_reserved.sh index a726a9a9eb65..6fa1668986cc 100755 --- a/tools/testing/selftests/net/forwarding/vxlan_reserved.sh +++ b/tools/testing/selftests/net/forwarding/vxlan_reserved.sh @@ -68,7 +68,7 @@ switch_create() adf_ip_link_set_up $rp1 adf_ip_addr_add $rp1 192.0.2.17/28 - ip_route_add 192.0.2.32/28 nexthop via 192.0.2.18 + adf_ip_route_add 192.0.2.32/28 nexthop via 192.0.2.18 adf_ip_link_set_master $swp1 br1 adf_ip_link_set_up $swp1 diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/net/lib.sh index 70331c3baa47..208919a44703 100644 --- a/tools/testing/selftests/net/lib.sh +++ b/tools/testing/selftests/net/lib.sh @@ -613,7 +613,7 @@ adf_ip_addr_add() defer ip addr del dev "$name" "$@" } -ip_route_add() +adf_ip_route_add() { ip route add "$@" && \ defer ip route del "$@" -- 2.49.0
