selftests: net: lib: Rename bridge_vlan_add() 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/93526ce79e635a3ec34753c796edf0c96711547d.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 b8fd85a20b7859f7e4b26ff855d6cc7017664056..c1a506370c4a9f85c793ef70fd1a762624ceb14d 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
@@ -118,15 +118,15 @@ adf_bridge_configure()
        adf_ip_addr_add br 192.0.2.3/28
        adf_ip_addr_add br 2001:db8:1::3/64
 
-       bridge_vlan_add dev br vid 1 pvid untagged self
-       bridge_vlan_add dev br vid 2 self
-       bridge_vlan_add dev br vid 3 self
+       adf_bridge_vlan_add dev br vid 1 pvid untagged self
+       adf_bridge_vlan_add dev br vid 2 self
+       adf_bridge_vlan_add dev br vid 3 self
 
        for dev in "$swp1" "$swp2"; do
                adf_ip_link_set_master "$dev" br
-               bridge_vlan_add dev "$dev" vid 1 pvid untagged
-               bridge_vlan_add dev "$dev" vid 2
-               bridge_vlan_add dev "$dev" vid 3
+               adf_bridge_vlan_add dev "$dev" vid 1 pvid untagged
+               adf_bridge_vlan_add dev "$dev" vid 2
+               adf_bridge_vlan_add dev "$dev" vid 3
        done
 }
 

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 091833541b06e8c33e0a53b3e5631778370198a6..a968a3ecbcbf053708aa639f414928f8132e6a57 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
@@ -222,8 +222,8 @@ switch_create()
        # $swp1
        adf_ip_link_set_up "$swp1"
        adf_ip_link_set_master "$swp1" br1
-       bridge_vlan_add vid 10 dev "$swp1"
-       bridge_vlan_add vid 20 dev "$swp1"
+       adf_bridge_vlan_add vid 10 dev "$swp1"
+       adf_bridge_vlan_add vid 20 dev "$swp1"
 
        # $swp2
        adf_ip_link_set_up "$swp2"
@@ -245,7 +245,7 @@ vx_create()
                nolearning noudpcsum tos inherit ttl 16 \
                "$@"
        adf_ip_link_set_master "$name" br1
-       bridge_vlan_add vid "$vid" dev "$name" pvid untagged
+       adf_bridge_vlan_add vid "$vid" dev "$name" pvid untagged
 }
 export -f vx_create
 
@@ -307,8 +307,8 @@ ns_init_common()
        adf_ip_link_add w1 type veth peer name w2
        adf_ip_link_set_master w1 br1
        adf_ip_link_set_up w1
-       bridge_vlan_add vid 10 dev w1
-       bridge_vlan_add vid 20 dev w1
+       adf_bridge_vlan_add vid 10 dev w1
+       adf_bridge_vlan_add vid 20 dev w1
 
        # w2
        simple_if_init w2

diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/net/lib.sh
index 208919a447032fb55aa9e8120824fa10a69b6800..feba4ef69a5496412bf507eb8c776a9aa6efac0d 100644 (file)
--- a/tools/testing/selftests/net/lib.sh
+++ b/tools/testing/selftests/net/lib.sh
@@ -619,7 +619,7 @@ adf_ip_route_add()
                defer ip route del "$@"
 }
 
-bridge_vlan_add()
+adf_bridge_vlan_add()
 {
        bridge vlan add "$@" && \
                defer bridge vlan del "$@"

diff --git a/tools/testing/selftests/net/vlan_bridge_binding.sh b/tools/testing/selftests/net/vlan_bridge_binding.sh
index 09081bcbfcc774b3468a194a7dac7836634a9efc..794ba71c45cb1ae75a381b858d2fd7fdcfe1bb90 100755 (executable)
--- a/tools/testing/selftests/net/vlan_bridge_binding.sh
+++ b/tools/testing/selftests/net/vlan_bridge_binding.sh
@@ -27,20 +27,20 @@ setup_prepare()
                adf_ip_link_set_master $port br
        done
 
-       bridge_vlan_add vid 11 dev br self
-       bridge_vlan_add vid 11 dev d1 master
+       adf_bridge_vlan_add vid 11 dev br self
+       adf_bridge_vlan_add vid 11 dev d1 master
 
-       bridge_vlan_add vid 12 dev br self
-       bridge_vlan_add vid 12 dev d2 master
+       adf_bridge_vlan_add vid 12 dev br self
+       adf_bridge_vlan_add vid 12 dev d2 master
 
-       bridge_vlan_add vid 13 dev br self
-       bridge_vlan_add vid 13 dev d1 master
-       bridge_vlan_add vid 13 dev d2 master
+       adf_bridge_vlan_add vid 13 dev br self
+       adf_bridge_vlan_add vid 13 dev d1 master
+       adf_bridge_vlan_add vid 13 dev d2 master
 
-       bridge_vlan_add vid 14 dev br self
-       bridge_vlan_add vid 14 dev d1 master
-       bridge_vlan_add vid 14 dev d2 master
-       bridge_vlan_add vid 14 dev d3 master
+       adf_bridge_vlan_add vid 14 dev br self
+       adf_bridge_vlan_add vid 14 dev d1 master
+       adf_bridge_vlan_add vid 14 dev d2 master
+       adf_bridge_vlan_add vid 14 dev d3 master
 }
 
 operstate_is()