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

selftests: net: lib: Rename ip_link_set_up() 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/475716ef792f5bd42e5c8ef1c3e287b1294f1630.1758821127.git.petrm@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Petr Machata and committed by
Jakub Kicinski
34d3f8b7 beb98a34

+32 -32
+3 -3
tools/testing/selftests/net/forwarding/bridge_activity_notify.sh
··· 40 40 { 41 41 adf_ip_link_add br1 type bridge vlan_filtering 0 mcast_snooping 0 \ 42 42 ageing_time "$LOW_AGEING_TIME" 43 - ip_link_set_up br1 43 + adf_ip_link_set_up br1 44 44 45 45 adf_ip_link_set_master "$swp1" br1 46 - ip_link_set_up "$swp1" 46 + adf_ip_link_set_up "$swp1" 47 47 48 48 adf_ip_link_set_master "$swp2" br1 49 - ip_link_set_up "$swp2" 49 + adf_ip_link_set_up "$swp2" 50 50 } 51 51 52 52 setup_prepare()
+3 -3
tools/testing/selftests/net/forwarding/bridge_fdb_local_vlan_0.sh
··· 78 78 79 79 switch_create() 80 80 { 81 - ip_link_set_up "$swp1" 81 + adf_ip_link_set_up "$swp1" 82 82 83 - ip_link_set_up "$swp2" 83 + adf_ip_link_set_up "$swp2" 84 84 85 85 ip_addr_add "$swp3" 192.0.2.17/28 86 86 ip_addr_add "$swp3" 2001:db8:2::1/64 87 - ip_link_set_up "$swp3" 87 + adf_ip_link_set_up "$swp3" 88 88 } 89 89 90 90 setup_prepare()
+19 -19
tools/testing/selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh
··· 123 123 defer simple_if_fini "$h1" 124 124 125 125 adf_ip_link_add "$h1.10" master "v$h1" link "$h1" type vlan id 10 126 - ip_link_set_up "$h1.10" 126 + adf_ip_link_set_up "$h1.10" 127 127 ip_addr_add "$h1.10" 192.0.2.1/28 128 128 129 129 adf_ip_link_add "$h1.20" master "v$h1" link "$h1" type vlan id 20 130 - ip_link_set_up "$h1.20" 130 + adf_ip_link_set_up "$h1.20" 131 131 ip_addr_add "$h1.20" 2001:db8:1::1/64 132 132 } 133 133 ··· 152 152 h2_create() 153 153 { 154 154 # $h2 155 - ip_link_set_up "$h2" 155 + adf_ip_link_set_up "$h2" 156 156 157 157 # H2 158 158 vrf_create "v$h2" 159 159 defer vrf_destroy "v$h2" 160 160 161 - ip_link_set_up "v$h2" 161 + adf_ip_link_set_up "v$h2" 162 162 163 163 # br2 164 164 adf_ip_link_add br2 type bridge vlan_filtering 0 mcast_snooping 0 165 165 adf_ip_link_set_master br2 "v$h2" 166 - ip_link_set_up br2 166 + adf_ip_link_set_up br2 167 167 168 168 # $h2 169 169 adf_ip_link_set_master "$h2" br2 170 170 install_capture "$h2" 171 171 172 172 # v1$h2 173 - ip_link_set_up "v1$h2" 173 + adf_ip_link_set_up "v1$h2" 174 174 adf_ip_link_set_master "v1$h2" br2 175 175 } 176 176 177 177 h3_create() 178 178 { 179 179 # $h3 180 - ip_link_set_up "$h3" 180 + adf_ip_link_set_up "$h3" 181 181 182 182 # H3 183 183 vrf_create "v$h3" 184 184 defer vrf_destroy "v$h3" 185 185 186 - ip_link_set_up "v$h3" 186 + adf_ip_link_set_up "v$h3" 187 187 188 188 # br3 189 189 adf_ip_link_add br3 type bridge vlan_filtering 0 mcast_snooping 0 190 190 adf_ip_link_set_master br3 "v$h3" 191 - ip_link_set_up br3 191 + adf_ip_link_set_up br3 192 192 193 193 # $h3 194 194 adf_ip_link_set_master "$h3" br3 195 195 install_capture "$h3" 196 196 197 197 # v1$h3 198 - ip_link_set_up "v1$h3" 198 + adf_ip_link_set_up "v1$h3" 199 199 adf_ip_link_set_master "v1$h3" br3 200 200 } 201 201 ··· 208 208 adf_ip_link_add br1 type bridge vlan_filtering 1 \ 209 209 vlan_default_pvid 0 mcast_snooping 0 210 210 adf_ip_link_set_addr br1 "$swp1_mac" 211 - ip_link_set_up br1 211 + adf_ip_link_set_up br1 212 212 213 213 # A dummy to force the IPv6 OIF=0 test to install a suitable MC route on 214 214 # $IPMR to be deterministic. Also used for the IPv6 RX!=TX ping test. ··· 220 220 ip_addr_add "$IPMR" 2001:db8:4::1/64 221 221 222 222 # $swp1 223 - ip_link_set_up "$swp1" 223 + adf_ip_link_set_up "$swp1" 224 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 228 228 # $swp2 229 - ip_link_set_up "$swp2" 229 + adf_ip_link_set_up "$swp2" 230 230 ip_addr_add "$swp2" 192.0.2.33/28 231 231 ip_addr_add "$swp2" 2001:db8:2::1/64 232 232 233 233 # $swp3 234 - ip_link_set_up "$swp3" 234 + adf_ip_link_set_up "$swp3" 235 235 ip_addr_add "$swp3" 192.0.2.65/28 236 236 ip_addr_add "$swp3" 2001:db8:3::1/64 237 237 } ··· 290 290 local ipv6_host=$1; shift 291 291 292 292 # v2$h2 / v2$h3 293 - ip_link_set_up "$if_in" 293 + adf_ip_link_set_up "$if_in" 294 294 ip_addr_add "$if_in" "$ipv4_in" 295 295 ip_addr_add "$if_in" "$ipv6_in" 296 296 297 297 # br1 298 298 adf_ip_link_add br1 type bridge vlan_filtering 1 \ 299 299 vlan_default_pvid 0 mcast_snooping 0 300 - ip_link_set_up br1 300 + adf_ip_link_set_up br1 301 301 302 302 # vx10, vx20 303 303 vx10_create local "${ipv4_in%/*}" group "$GROUP4" dev "$if_in" ··· 306 306 # w1 307 307 adf_ip_link_add w1 type veth peer name w2 308 308 adf_ip_link_set_master w1 br1 309 - ip_link_set_up w1 309 + adf_ip_link_set_up w1 310 310 bridge_vlan_add vid 10 dev w1 311 311 bridge_vlan_add vid 20 dev w1 312 312 ··· 316 316 317 317 # w2.10 318 318 adf_ip_link_add w2.10 master vw2 link w2 type vlan id 10 319 - ip_link_set_up w2.10 319 + adf_ip_link_set_up w2.10 320 320 ip_addr_add w2.10 "$ipv4_host" 321 321 322 322 # w2.20 323 323 adf_ip_link_add w2.20 master vw2 link w2 type vlan id 20 324 - ip_link_set_up w2.20 324 + adf_ip_link_set_up w2.20 325 325 ip_addr_add w2.20 "$ipv6_host" 326 326 } 327 327 export -f ns_init_common
+3 -3
tools/testing/selftests/net/forwarding/vxlan_reserved.sh
··· 64 64 # Make sure the bridge uses the MAC address of the local port and not 65 65 # that of the VxLAN's device. 66 66 adf_ip_link_set_addr br1 $(mac_get $swp1) 67 - ip_link_set_up br1 67 + adf_ip_link_set_up br1 68 68 69 - ip_link_set_up $rp1 69 + adf_ip_link_set_up $rp1 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 73 adf_ip_link_set_master $swp1 br1 74 - ip_link_set_up $swp1 74 + adf_ip_link_set_up $swp1 75 75 } 76 76 77 77 vrp2_create()
+1 -1
tools/testing/selftests/net/lib.sh
··· 585 585 ip_link_has_flag "$1" UP 586 586 } 587 587 588 - ip_link_set_up() 588 + adf_ip_link_set_up() 589 589 { 590 590 local name=$1; shift 591 591
+1 -1
tools/testing/selftests/net/test_vxlan_fdb_changelink.sh
··· 75 75 check_command netstat || return 76 76 77 77 adf_ip_link_add v1 up type veth peer name v2 78 - ip_link_set_up v2 78 + adf_ip_link_set_up v2 79 79 80 80 RET=0 81 81
+2 -2
tools/testing/selftests/net/vlan_bridge_binding.sh
··· 22 22 23 23 for port in d1 d2 d3; do 24 24 adf_ip_link_add $port type veth peer name r$port 25 - ip_link_set_up $port 26 - ip_link_set_up r$port 25 + adf_ip_link_set_up $port 26 + adf_ip_link_set_up r$port 27 27 adf_ip_link_set_master $port br 28 28 done 29 29