github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-22 14:12:07 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
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>
This commit is contained in:
Petr Machata 2025-09-25 19:31:51 +02:00 committed by Jakub Kicinski
parent d85bcf6505
commit b628dfcd54
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/testing/selftests/net/forwarding/bridge_fdb_local_vlan_0.sh
View File

@ -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
}

10
tools/testing/selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh
View File

@ -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

2
tools/testing/selftests/net/lib.sh
View File

@ -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 "$@"

22
tools/testing/selftests/net/vlan_bridge_binding.sh
View File

@ -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()