tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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@nvidia.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/53ce64231faa1396a968b2869af5f1c0aebec2c9.1758821127.git.petrm@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Petr Machata and committed by
Jakub Kicinski c3cbd21f 191c4912

+19 -19
+3 -3
tools/testing/selftests/net/fdb_notify.sh
··· 49 49 { 50 50 adf_ip_link_add br up type bridge vlan_filtering 1 51 51 adf_ip_link_add vx up type vxlan id 2000 dstport 4789 52 - ip_link_set_master vx br 52 + adf_ip_link_set_master vx br 53 53 54 54 do_test_dup add "vxlan" dev vx self dst 192.0.2.1 55 55 do_test_dup del "vxlan" dev vx self dst 192.0.2.1 ··· 59 59 { 60 60 adf_ip_link_add br up type bridge vlan_filtering 1 61 61 adf_ip_link_add vx up type vxlan id 2000 dstport 4789 62 - ip_link_set_master vx br 62 + adf_ip_link_set_master vx br 63 63 64 64 do_test_dup add "vxlan master" dev vx master 65 65 do_test_dup del "vxlan master" dev vx master ··· 79 79 adf_ip_link_add br up type bridge vlan_filtering 1 80 80 adf_ip_link_add dd up type dummy 81 81 adf_ip_link_add mv up link dd type macvlan mode passthru 82 - ip_link_set_master mv br 82 + adf_ip_link_set_master mv br 83 83 84 84 do_test_dup add "macvlan master" dev mv self 85 85 do_test_dup del "macvlan master" dev mv self
+2 -2
tools/testing/selftests/net/forwarding/bridge_activity_notify.sh
··· 42 42 ageing_time "$LOW_AGEING_TIME" 43 43 ip_link_set_up br1 44 44 45 - ip_link_set_master "$swp1" br1 45 + adf_ip_link_set_master "$swp1" br1 46 46 ip_link_set_up "$swp1" 47 47 48 - ip_link_set_master "$swp2" br1 48 + adf_ip_link_set_master "$swp2" br1 49 49 ip_link_set_up "$swp2" 50 50 } 51 51
+1 -1
tools/testing/selftests/net/forwarding/bridge_fdb_local_vlan_0.sh
··· 123 123 bridge_vlan_add dev br vid 3 self 124 124 125 125 for dev in "$swp1" "$swp2"; do 126 - ip_link_set_master "$dev" br 126 + adf_ip_link_set_master "$dev" br 127 127 bridge_vlan_add dev "$dev" vid 1 pvid untagged 128 128 bridge_vlan_add dev "$dev" vid 2 129 129 bridge_vlan_add dev "$dev" vid 3
+9 -9
tools/testing/selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh
··· 162 162 163 163 # br2 164 164 adf_ip_link_add br2 type bridge vlan_filtering 0 mcast_snooping 0 165 - ip_link_set_master br2 "v$h2" 165 + adf_ip_link_set_master br2 "v$h2" 166 166 ip_link_set_up br2 167 167 168 168 # $h2 169 - ip_link_set_master "$h2" br2 169 + adf_ip_link_set_master "$h2" br2 170 170 install_capture "$h2" 171 171 172 172 # v1$h2 173 173 ip_link_set_up "v1$h2" 174 - ip_link_set_master "v1$h2" br2 174 + adf_ip_link_set_master "v1$h2" br2 175 175 } 176 176 177 177 h3_create() ··· 187 187 188 188 # br3 189 189 adf_ip_link_add br3 type bridge vlan_filtering 0 mcast_snooping 0 190 - ip_link_set_master br3 "v$h3" 190 + adf_ip_link_set_master br3 "v$h3" 191 191 ip_link_set_up br3 192 192 193 193 # $h3 194 - ip_link_set_master "$h3" br3 194 + adf_ip_link_set_master "$h3" br3 195 195 install_capture "$h3" 196 196 197 197 # v1$h3 198 198 ip_link_set_up "v1$h3" 199 - ip_link_set_master "v1$h3" br3 199 + adf_ip_link_set_master "v1$h3" br3 200 200 } 201 201 202 202 switch_create() ··· 221 221 222 222 # $swp1 223 223 ip_link_set_up "$swp1" 224 - ip_link_set_master "$swp1" br1 224 + adf_ip_link_set_master "$swp1" br1 225 225 bridge_vlan_add vid 10 dev "$swp1" 226 226 bridge_vlan_add vid 20 dev "$swp1" 227 227 ··· 244 244 adf_ip_link_add "$name" up type vxlan dstport "$VXPORT" \ 245 245 nolearning noudpcsum tos inherit ttl 16 \ 246 246 "$@" 247 - ip_link_set_master "$name" br1 247 + adf_ip_link_set_master "$name" br1 248 248 bridge_vlan_add vid "$vid" dev "$name" pvid untagged 249 249 } 250 250 export -f vx_create ··· 305 305 306 306 # w1 307 307 adf_ip_link_add w1 type veth peer name w2 308 - ip_link_set_master w1 br1 308 + adf_ip_link_set_master w1 br1 309 309 ip_link_set_up w1 310 310 bridge_vlan_add vid 10 dev w1 311 311 bridge_vlan_add vid 20 dev w1
+2 -2
tools/testing/selftests/net/forwarding/vxlan_reserved.sh
··· 70 70 ip_addr_add $rp1 192.0.2.17/28 71 71 ip_route_add 192.0.2.32/28 nexthop via 192.0.2.18 72 72 73 - ip_link_set_master $swp1 br1 73 + adf_ip_link_set_master $swp1 br1 74 74 ip_link_set_up $swp1 75 75 } 76 76 ··· 203 203 adf_ip_link_add vx1 up type vxlan id 1000 \ 204 204 local 192.0.2.17 dstport "$VXPORT" \ 205 205 nolearning noudpcsum tos inherit ttl 100 "$@" 206 - ip_link_set_master vx1 br1 206 + adf_ip_link_set_master vx1 br1 207 207 } 208 208 209 209 vxlan_all_reserved_bits()
+1 -1
tools/testing/selftests/net/lib.sh
··· 551 551 defer ip link del dev "$name" 552 552 } 553 553 554 - ip_link_set_master() 554 + adf_ip_link_set_master() 555 555 { 556 556 local member=$1; shift 557 557 local master=$1; shift
+1 -1
tools/testing/selftests/net/vlan_bridge_binding.sh
··· 24 24 adf_ip_link_add $port type veth peer name r$port 25 25 ip_link_set_up $port 26 26 ip_link_set_up r$port 27 - ip_link_set_master $port br 27 + adf_ip_link_set_master $port br 28 28 done 29 29 30 30 bridge_vlan_add vid 11 dev br self