]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
selftests: fix flower parent qdisc
authorVlad Buslov <vladbu@mellanox.com>
Thu, 14 May 2020 06:35:52 +0000 (09:35 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Jun 2020 14:41:51 +0000 (16:41 +0200)
commit2969d65942b3de1885420850357b4e0e5f7b5e12
tree6cb6c40568ee6da7de54153d54b10025c2f1bfb8
parent43d953084afae23517b533b07583960811969d7f
selftests: fix flower parent qdisc

[ Upstream commit 0531b0357ba37464e5c0033e1b7c69bbf5ecd8fb ]

Flower tests used to create ingress filter with specified parent qdisc
"parent ffff:" but dump them on "ingress". With recent commit that fixed
tcm_parent handling in dump those are not considered same parent anymore,
which causes iproute2 tc to emit additional "parent ffff:" in first line of
filter dump output. The change in output causes filter match in tests to
fail.

Prevent parent qdisc output when dumping filters in flower tests by always
correctly specifying "ingress" parent both when creating and dumping
filters.

Fixes: a7df4870d79b ("net_sched: fix tcm_parent in tc filter dump")
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/testing/selftests/tc-testing/tc-tests/filters/tests.json
tools/testing/selftests/tc-testing/tdc_batch.py