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 | 6 +++--- .../selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh | 2 +- tools/testing/selftests/net/forwarding/vxlan_reserved.sh | 2 +- tools/testing/selftests/net/lib.sh | 2 +- 4 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 561cb9f253b6..07e07a266c80 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 @@ -137,7 +137,7 @@ adf_bridge_create() adf_ip_link_add br up type bridge vlan_default_pvid 0 "$@" mac=$(mac_get br) adf_bridge_configure - ip_link_set_addr br "$mac" + adf_ip_link_set_addr br "$mac" } check_fdb_local_vlan_0_support() @@ -296,7 +296,7 @@ change_mac() cur_mac=$(mac_get "$dev") log_info "Change $dev MAC $cur_mac -> $mac" - ip_link_set_addr "$dev" "$mac" + adf_ip_link_set_addr "$dev" "$mac" defer log_info "Change $dev MAC back" } @@ -376,7 +376,7 @@ test_q_sharing() adf_addr_set_bridge_create() { adf_ip_link_add br up type bridge vlan_filtering 0 - ip_link_set_addr br "$(mac_get br)" + adf_ip_link_set_addr br "$(mac_get br)" adf_bridge_configure } diff --git a/tools/testing/selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh b/tools/testing/selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh index 9fc956caf961..e344cb2a5f04 100755 --- a/tools/testing/selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh +++ b/tools/testing/selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh @@ -207,7 +207,7 @@ switch_create() swp1_mac=$(mac_get "$swp1") adf_ip_link_add br1 type bridge vlan_filtering 1 \ vlan_default_pvid 0 mcast_snooping 0 - ip_link_set_addr br1 "$swp1_mac" + adf_ip_link_set_addr br1 "$swp1_mac" ip_link_set_up br1 # A dummy to force the IPv6 OIF=0 test to install a suitable MC route on diff --git a/tools/testing/selftests/net/forwarding/vxlan_reserved.sh b/tools/testing/selftests/net/forwarding/vxlan_reserved.sh index 839def391b6e..c0c96fdb16e6 100755 --- a/tools/testing/selftests/net/forwarding/vxlan_reserved.sh +++ b/tools/testing/selftests/net/forwarding/vxlan_reserved.sh @@ -63,7 +63,7 @@ switch_create() adf_ip_link_add br1 type bridge vlan_filtering 0 mcast_snooping 0 # Make sure the bridge uses the MAC address of the local port and not # that of the VxLAN's device. - ip_link_set_addr br1 $(mac_get $swp1) + adf_ip_link_set_addr br1 $(mac_get $swp1) ip_link_set_up br1 ip_link_set_up $rp1 diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/net/lib.sh index c9a15fe5448a..21b998b7330f 100644 --- a/tools/testing/selftests/net/lib.sh +++ b/tools/testing/selftests/net/lib.sh @@ -560,7 +560,7 @@ adf_ip_link_set_master() defer ip link set dev "$member" nomaster } -ip_link_set_addr() +adf_ip_link_set_addr() { local name=$1; shift local addr=$1; shift -- 2.49.0
