The commit is pushed to "branch-rh10-6.12.0-55.52.1.5.x.vz10-ovz" and will
appear at [email protected]:openvz/vzkernel.git
after rh10-6.12.0-55.52.1.5.10.vz10
------>
commit 326c61a30ee6ef1780ab8282477af52ae5bac04e
Author: Aleksei Oladko <[email protected]>
Date: Mon Mar 2 08:39:34 2026 +0000
Revert "selftests: forwarding: fix pedit tests failure with br_netfilter
enabled"
This reverts commit 035048df284280dc621046b7069bf8ced6d432cd.
The mainstream version of the patch will be applied instead.
https://virtuozzo.atlassian.net/browse/VSTOR-123249
Signed-off-by: Aleksei Oladko <[email protected]>
Feature: fix selftests
---
tools/testing/selftests/net/forwarding/pedit_dsfield.sh | 5 ++---
tools/testing/selftests/net/forwarding/pedit_ip.sh | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/net/forwarding/pedit_dsfield.sh
b/tools/testing/selftests/net/forwarding/pedit_dsfield.sh
index 310f96fb22743..af008fbf2725e 100755
--- a/tools/testing/selftests/net/forwarding/pedit_dsfield.sh
+++ b/tools/testing/selftests/net/forwarding/pedit_dsfield.sh
@@ -156,7 +156,7 @@ do_test_pedit_dsfield()
local daddr=$1; shift
tc filter add $pedit_locus handle 101 pref 1 \
- flower action pedit ex munge $pedit_action pipe action csum ip
+ flower action pedit ex munge $pedit_action
tc filter add dev $h2 ingress handle 101 pref 1 prot $match_prot \
flower skip_hw $match_flower action pass
@@ -229,8 +229,7 @@ do_test_ip_dscp_ecn()
tc filter add $locus handle 101 pref 1 \
flower action pedit ex munge ip dsfield set 124 retain 0xfc \
- action pedit ex munge ip dsfield set 1 retain 0x03 \
- pipe action csum ip
+ action pedit ex munge ip dsfield set 1 retain 0x03
tc filter add dev $h2 ingress handle 101 pref 1 prot ip \
flower skip_hw ip_tos 125 action pass
diff --git a/tools/testing/selftests/net/forwarding/pedit_ip.sh
b/tools/testing/selftests/net/forwarding/pedit_ip.sh
index a53ee3b1ef671..d14efb2d23b2e 100755
--- a/tools/testing/selftests/net/forwarding/pedit_ip.sh
+++ b/tools/testing/selftests/net/forwarding/pedit_ip.sh
@@ -122,7 +122,7 @@ do_test_pedit_ip()
local mz_flags=$1; shift
tc filter add $pedit_locus handle 101 pref 1 \
- flower action pedit ex munge $pedit_action pipe action csum ip
+ flower action pedit ex munge $pedit_action
tc filter add dev $h2 ingress handle 101 pref 1 prot $match_prot \
flower skip_hw $match_flower action pass
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel
