Commit 7b17d2d7 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

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: default avatarPaolo Abeni <pabeni@redhat.com>
parents 4723832f f70f5f1a

tools/testing/selftests/net/forwarding/bridge_locked_port.sh

+4 −8
Original line number Diff line number Diff line
@@ -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()