| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <53ce64231faa1396a968b2869af5f1c0aebec2c9.1758821127.git.petrm@nvidia.com>
Date: Thu, 25 Sep 2025 19:31:45 +0200
From: Petr Machata <petrm@...dia.com>
To: "David S. Miller" <davem@...emloft.net>, Eric Dumazet
<edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>, Paolo Abeni
<pabeni@...hat.com>, <netdev@...r.kernel.org>
CC: Simon Horman <horms@...nel.org>, Ido Schimmel <idosch@...dia.com>,
"Nikolay Aleksandrov" <razor@...ckwall.org>, Petr Machata <petrm@...dia.com>,
"Shuah Khan" <shuah@...nel.org>, <linux-kselftest@...r.kernel.org>,
<mlxsw@...dia.com>
Subject: [PATCH net-next 02/13] selftests: net: lib: Rename ip_link_set_master() 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@...dia.com>
---
tools/testing/selftests/net/fdb_notify.sh | 6 +++---
.../net/forwarding/bridge_activity_notify.sh | 4 ++--
.../net/forwarding/bridge_fdb_local_vlan_0.sh | 2 +-
.../net/forwarding/vxlan_bridge_1q_mc_ul.sh | 18 +++++++++---------
.../selftests/net/forwarding/vxlan_reserved.sh | 4 ++--
tools/testing/selftests/net/lib.sh | 2 +-
.../selftests/net/vlan_bridge_binding.sh | 2 +-
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/tools/testing/selftests/net/fdb_notify.sh b/tools/testing/selftests/net/fdb_notify.sh
index 0a70f6383bfc..0b8a2465dd04 100755
--- a/tools/testing/selftests/net/fdb_notify.sh
+++ b/tools/testing/selftests/net/fdb_notify.sh
@@ -49,7 +49,7 @@ test_dup_vxlan_self()
{
adf_ip_link_add br up type bridge vlan_filtering 1
adf_ip_link_add vx up type vxlan id 2000 dstport 4789
- ip_link_set_master vx br
+ adf_ip_link_set_master vx br
do_test_dup add "vxlan" dev vx self dst 192.0.2.1
do_test_dup del "vxlan" dev vx self dst 192.0.2.1
@@ -59,7 +59,7 @@ test_dup_vxlan_master()
{
adf_ip_link_add br up type bridge vlan_filtering 1
adf_ip_link_add vx up type vxlan id 2000 dstport 4789
- ip_link_set_master vx br
+ adf_ip_link_set_master vx br
do_test_dup add "vxlan master" dev vx master
do_test_dup del "vxlan master" dev vx master
@@ -79,7 +79,7 @@ test_dup_macvlan_master()
adf_ip_link_add br up type bridge vlan_filtering 1
adf_ip_link_add dd up type dummy
adf_ip_link_add mv up link dd type macvlan mode passthru
- ip_link_set_master mv br
+ adf_ip_link_set_master mv br
do_test_dup add "macvlan master" dev mv self
do_test_dup del "macvlan master" dev mv self
diff --git a/tools/testing/selftests/net/forwarding/bridge_activity_notify.sh b/tools/testing/selftests/net/forwarding/bridge_activity_notify.sh
index 6f7df6325da5..3d5f868b261a 100755
--- a/tools/testing/selftests/net/forwarding/bridge_activity_notify.sh
+++ b/tools/testing/selftests/net/forwarding/bridge_activity_notify.sh
@@ -42,10 +42,10 @@ switch_create()
ageing_time "$LOW_AGEING_TIME"
ip_link_set_up br1
- ip_link_set_master "$swp1" br1
+ adf_ip_link_set_master "$swp1" br1
ip_link_set_up "$swp1"
- ip_link_set_master "$swp2" br1
+ adf_ip_link_set_master "$swp2" br1
ip_link_set_up "$swp2"
}
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 d9de3ad6e162..561cb9f253b6 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
@@ -123,7 +123,7 @@ adf_bridge_configure()
bridge_vlan_add dev br vid 3 self
for dev in "$swp1" "$swp2"; do
- ip_link_set_master "$dev" br
+ 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
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 503b1176d55f..9fc956caf961 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
@@ -162,16 +162,16 @@ h2_create()
# br2
adf_ip_link_add br2 type bridge vlan_filtering 0 mcast_snooping 0
- ip_link_set_master br2 "v$h2"
+ adf_ip_link_set_master br2 "v$h2"
ip_link_set_up br2
# $h2
- ip_link_set_master "$h2" br2
+ adf_ip_link_set_master "$h2" br2
install_capture "$h2"
# v1$h2
ip_link_set_up "v1$h2"
- ip_link_set_master "v1$h2" br2
+ adf_ip_link_set_master "v1$h2" br2
}
h3_create()
@@ -187,16 +187,16 @@ h3_create()
# br3
adf_ip_link_add br3 type bridge vlan_filtering 0 mcast_snooping 0
- ip_link_set_master br3 "v$h3"
+ adf_ip_link_set_master br3 "v$h3"
ip_link_set_up br3
# $h3
- ip_link_set_master "$h3" br3
+ adf_ip_link_set_master "$h3" br3
install_capture "$h3"
# v1$h3
ip_link_set_up "v1$h3"
- ip_link_set_master "v1$h3" br3
+ adf_ip_link_set_master "v1$h3" br3
}
switch_create()
@@ -221,7 +221,7 @@ switch_create()
# $swp1
ip_link_set_up "$swp1"
- ip_link_set_master "$swp1" br1
+ adf_ip_link_set_master "$swp1" br1
bridge_vlan_add vid 10 dev "$swp1"
bridge_vlan_add vid 20 dev "$swp1"
@@ -244,7 +244,7 @@ vx_create()
adf_ip_link_add "$name" up type vxlan dstport "$VXPORT" \
nolearning noudpcsum tos inherit ttl 16 \
"$@"
- ip_link_set_master "$name" br1
+ adf_ip_link_set_master "$name" br1
bridge_vlan_add vid "$vid" dev "$name" pvid untagged
}
export -f vx_create
@@ -305,7 +305,7 @@ ns_init_common()
# w1
adf_ip_link_add w1 type veth peer name w2
- ip_link_set_master w1 br1
+ adf_ip_link_set_master w1 br1
ip_link_set_up w1
bridge_vlan_add vid 10 dev w1
bridge_vlan_add vid 20 dev w1
diff --git a/tools/testing/selftests/net/forwarding/vxlan_reserved.sh b/tools/testing/selftests/net/forwarding/vxlan_reserved.sh
index 692644c3a489..839def391b6e 100755
--- a/tools/testing/selftests/net/forwarding/vxlan_reserved.sh
+++ b/tools/testing/selftests/net/forwarding/vxlan_reserved.sh
@@ -70,7 +70,7 @@ switch_create()
ip_addr_add $rp1 192.0.2.17/28
ip_route_add 192.0.2.32/28 nexthop via 192.0.2.18
- ip_link_set_master $swp1 br1
+ adf_ip_link_set_master $swp1 br1
ip_link_set_up $swp1
}
@@ -203,7 +203,7 @@ vxlan_device_add()
adf_ip_link_add vx1 up type vxlan id 1000 \
local 192.0.2.17 dstport "$VXPORT" \
nolearning noudpcsum tos inherit ttl 100 "$@"
- ip_link_set_master vx1 br1
+ adf_ip_link_set_master vx1 br1
}
vxlan_all_reserved_bits()
diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/net/lib.sh
index 7fbd9e5ce2be..c9a15fe5448a 100644
--- a/tools/testing/selftests/net/lib.sh
+++ b/tools/testing/selftests/net/lib.sh
@@ -551,7 +551,7 @@ adf_ip_link_add()
defer ip link del dev "$name"
}
-ip_link_set_master()
+adf_ip_link_set_master()
{
local member=$1; shift
local master=$1; shift
diff --git a/tools/testing/selftests/net/vlan_bridge_binding.sh b/tools/testing/selftests/net/vlan_bridge_binding.sh
index 7797507cd14f..ad02d406039c 100755
--- a/tools/testing/selftests/net/vlan_bridge_binding.sh
+++ b/tools/testing/selftests/net/vlan_bridge_binding.sh
@@ -24,7 +24,7 @@ setup_prepare()
adf_ip_link_add $port type veth peer name r$port
ip_link_set_up $port
ip_link_set_up r$port
- ip_link_set_master $port br
+ adf_ip_link_set_master $port br
done
bridge_vlan_add vid 11 dev br self
--
2.49.0
Powered by blists - more mailing lists