selftests: net: lib: Rename ip_link_set_addr() to adf_*

Rename this function to mark it as autodefer.
For details, see the discussion in the cover letter.

Signed-off-by: Petr Machata <petrm@nvidia.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/5318e90f7f491f9f397ac221a8b47fdbedd0d3b2.1758821127.git.petrm@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

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 561cb9f253b67ef3d390a0f810b36f09bb32c6d0..07e07a266c80ae131ac127497a69eb4f3bf0a33c 100755 (executable)
--- 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 9fc956caf9611742e75b70f53d0cf82f2e1cbe3c..e344cb2a5f0466280c354501b9142141f50f90e5 100755 (executable)
--- 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 839def391b6e668be41b6472fc20467e88dc980f..c0c96fdb16e6bcd66ade9705849951be83387736 100755 (executable)
--- 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 c9a15fe5448a5438f2811038cea2a4952c68d03b..21b998b7330f83f752bb73bae03ad31c4aa2884b 100644 (file)
--- 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