kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_bridge.sh
..
..
@@ -36,8 +36,6 @@
36
36
 
37
37
 h1_create()
38
38
 {
39
-	local dscp;
40
-
41
39
 	simple_if_init $h1 192.0.2.1/28
42
40
 	tc qdisc add dev $h1 clsact
43
41
 	dscp_capture_install $h1 10
..
..
@@ -67,6 +65,7 @@
67
65
 dscp_map()
68
66
 {
69
67
 	local base=$1; shift
68
+	local prio
70
69
 
71
70
 	for prio in {0..7}; do
72
71
 		echo app=$prio,5,$((base + prio))
..
..
@@ -94,7 +93,9 @@
94
93
 	lldptool -T -i $swp1 -V APP -d $(dscp_map 10) >/dev/null
95
94
 	lldpad_app_wait_del
96
95
 
96
+	ip link set dev $swp2 down
97
97
 	ip link set dev $swp2 nomaster
98
+	ip link set dev $swp1 down
98
99
 	ip link set dev $swp1 nomaster
99
100
 	ip link del dev br1
100
101
 }
..
..
@@ -138,6 +139,7 @@
138
139
 	local prio=$1; shift
139
140
 	local dev_10=$1; shift
140
141
 	local dev_20=$1; shift
142
+	local key
141
143
 
142
144
 	local dscp_10=$(((prio + 10) << 2))
143
145
 	local dscp_20=$(((prio + 20) << 2))
..
..
@@ -148,9 +150,10 @@
148
150
 	eval "t0s=($(dscp_fetch_stats $dev_10 10)
149
151
 		   $(dscp_fetch_stats $dev_20 20))"
150
152
 
153
+	local ping_timeout=$((PING_TIMEOUT * 5))
151
154
 	ip vrf exec $vrf_name \
152
155
 	   ${PING} -Q $dscp_10 ${sip:+-I $sip} $dip \
153
-		   -c 10 -i 0.1 -w 2 &> /dev/null
156
+		   -c 10 -i 0.5 -w $ping_timeout &> /dev/null
154
157
 
155
158
 	local -A t1s
156
159
 	eval "t1s=($(dscp_fetch_stats $dev_10 10)
..
..
@@ -174,6 +177,8 @@
174
177
 
175
178
 test_dscp()
176
179
 {
180
+	local prio
181
+
177
182
 	for prio in {0..7}; do
178
183
 		dscp_ping_test v$h1 192.0.2.1 192.0.2.2 $prio $h1 $h2
179
184
 	done