移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/tools/testing/selftests/net/forwarding/router_broadcast.sh
..
..
@@ -145,16 +145,19 @@
145
145
 {
146
146
 	sysctl_set net.ipv4.conf.all.bc_forwarding 0
147
147
 	sysctl_set net.ipv4.conf.$rp1.bc_forwarding 0
148
+	sysctl_set net.ipv4.conf.$rp2.bc_forwarding 0
148
149
 }
149
150
 
150
151
 bc_forwarding_enable()
151
152
 {
152
153
 	sysctl_set net.ipv4.conf.all.bc_forwarding 1
153
154
 	sysctl_set net.ipv4.conf.$rp1.bc_forwarding 1
155
+	sysctl_set net.ipv4.conf.$rp2.bc_forwarding 1
154
156
 }
155
157
 
156
158
 bc_forwarding_restore()
157
159
 {
160
+	sysctl_restore net.ipv4.conf.$rp2.bc_forwarding
158
161
 	sysctl_restore net.ipv4.conf.$rp1.bc_forwarding
159
162
 	sysctl_restore net.ipv4.conf.all.bc_forwarding
160
163
 }
..
..
@@ -170,7 +173,8 @@
170
173
 
171
174
 	log_info "ping $dip, expected reply from $from"
172
175
 	ip vrf exec $(master_name_get $oif) \
173
-	$PING -I $oif $dip -c 10 -i 0.1 -w 2 -b 2>&1 | grep $from &> /dev/null
176
+		$PING -I $oif $dip -c 10 -i 0.1 -w $PING_TIMEOUT -b 2>&1 \
177
+		| grep "bytes from $from" > /dev/null
174
178
 	check_err_fail $fail $?
175
179
 }
176
180