Commit 7700476f authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

selftests: mlxsw: Fix local variable declarations in DSCP tests 



These two tests have some problems in the global scope pollution and on
contrary, contain unnecessary local declarations. Fix them.

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 70841488

tools/testing/selftests/drivers/net/mlxsw/qos_dscp_bridge.sh

+4 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ source $lib_dir/lib.sh 


h1_create()

{

	local dscp;



	simple_if_init $h1 192.0.2.1/28

	tc qdisc add dev $h1 clsact

	dscp_capture_install $h1 10
@@ -67,6 +65,7 @@ h2_destroy() 
dscp_map()

{

	local base=$1; shift

	local prio



	for prio in {0..7}; do

		echo app=$prio,5,$((base + prio))
@@ -138,6 +137,7 @@ dscp_ping_test() 
	local prio=$1; shift

	local dev_10=$1; shift

	local dev_20=$1; shift

	local key



	local dscp_10=$(((prio + 10) << 2))

	local dscp_20=$(((prio + 20) << 2))
@@ -175,6 +175,8 @@ dscp_ping_test() 


test_dscp()

{

	local prio



	for prio in {0..7}; do

		dscp_ping_test v$h1 192.0.2.1 192.0.2.2 $prio $h1 $h2

	done

tools/testing/selftests/drivers/net/mlxsw/qos_dscp_router.sh

+3 −2
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ reprioritize() 


h1_create()

{

	local dscp;



	simple_if_init $h1 192.0.2.1/28

	tc qdisc add dev $h1 clsact

	dscp_capture_install $h1 0
@@ -87,6 +85,7 @@ h2_destroy() 
dscp_map()

{

	local base=$1; shift

	local prio



	for prio in {0..7}; do

		echo app=$prio,5,$((base + prio))
@@ -156,6 +155,7 @@ dscp_ping_test() 
	local reprio=$1; shift

	local dev1=$1; shift

	local dev2=$1; shift

	local i



	local prio2=$($reprio $prio)   # ICMP Request egress prio

	local prio3=$($reprio $prio2)  # ICMP Response egress prio
@@ -205,6 +205,7 @@ __test_update() 
{

	local update=$1; shift

	local reprio=$1; shift

	local prio



	sysctl_restore net.ipv4.ip_forward_update_priority

	sysctl_set net.ipv4.ip_forward_update_priority $update

CRA Git | Maintained and supported by SUSTech CRA and CCSE