diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2022-03-22 11:09:28 +0100 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2022-03-22 11:09:29 +0100 |
| commit | 7b17d2d7d7bf5add35f1e9067ef9450698eac85e (patch) | |
| tree | 123fd2a17684dd77da89f6320e3377f642cf92da | |
| parent | 4723832fa63f30c85cce3739b0497e4e193f684b (diff) | |
| parent | f70f5f1a8ffff4c943182aa80c600aeec1b9b001 (diff) | |
Merge branch 'selftests-forwarding-locked-bridge-port-fixes'
Ido Schimmel says:
====================
selftests: forwarding: Locked bridge port fixes
Two fixes for the locked bridge port selftest.
====================
Link: https://lore.kernel.org/r/20220321175102.978020-1-idosch@nvidia.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
| -rwxr-xr-x | tools/testing/selftests/net/forwarding/bridge_locked_port.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tools/testing/selftests/net/forwarding/bridge_locked_port.sh b/tools/testing/selftests/net/forwarding/bridge_locked_port.sh index 6e98efa6d371..5b02b6b60ce7 100755 --- a/tools/testing/selftests/net/forwarding/bridge_locked_port.sh +++ b/tools/testing/selftests/net/forwarding/bridge_locked_port.sh @@ -9,9 +9,7 @@ source lib.sh h1_create() { simple_if_init $h1 192.0.2.1/24 2001:db8:1::1/64 - vrf_create "vrf-vlan-h1" - ip link set dev vrf-vlan-h1 up - vlan_create $h1 100 vrf-vlan-h1 198.51.100.1/24 + vlan_create $h1 100 v$h1 198.51.100.1/24 } h1_destroy() @@ -23,9 +21,7 @@ h1_destroy() h2_create() { simple_if_init $h2 192.0.2.2/24 2001:db8:1::2/64 - vrf_create "vrf-vlan-h2" - ip link set dev vrf-vlan-h2 up - vlan_create $h2 100 vrf-vlan-h2 198.51.100.2/24 + vlan_create $h2 100 v$h2 198.51.100.2/24 } h2_destroy() @@ -41,11 +37,11 @@ switch_create() ip link set dev $swp1 master br0 ip link set dev $swp2 master br0 + bridge link set dev $swp1 learning off + ip link set dev br0 up ip link set dev $swp1 up ip link set dev $swp2 up - - bridge link set dev $swp1 learning off } switch_destroy() |