diff options
| author | David S. Miller <davem@davemloft.net> | 2020-06-01 03:48:46 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-01 03:48:46 +0300 |
| commit | 1806c13dc2532090d742ce03847b22367fb20ad6 (patch) | |
| tree | 7507ddebec3046173a4308e1e0dd8701cd498d0f /tools/testing/selftests/tc-testing | |
| parent | 1079a34c56c535c3e27df8def0d3c5069d2de129 (diff) | |
| parent | bdc48fa11e46f867ea4d75fa59ee87a7f48be144 (diff) | |
| download | linux-1806c13dc2532090d742ce03847b22367fb20ad6.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
xdp_umem.c had overlapping changes between the 64-bit math fix
for the calculation of npgs and the removal of the zerocopy
memory type which got rid of the chunk_size_nohdr member.
The mlx5 Kconfig conflict is a case where we just take the
net-next copy of the Kconfig entry dependency as it takes on
the ESWITCH dependency by one level of indirection which is
what the 'net' conflicting change is trying to ensure.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/testing/selftests/tc-testing')
| -rw-r--r-- | tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_pie.json | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_pie.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_pie.json new file mode 100644 index 000000000000..1cda2e11b3ad --- /dev/null +++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_pie.json @@ -0,0 +1,21 @@ +[ + { + "id": "83be", + "name": "Create FQ-PIE with invalid number of flows", + "category": [ + "qdisc", + "fq_pie" + ], + "setup": [ + "$IP link add dev $DUMMY type dummy || /bin/true" + ], + "cmdUnderTest": "$TC qdisc add dev $DUMMY root fq_pie flows 65536", + "expExitCode": "2", + "verifyCmd": "$TC qdisc show dev $DUMMY", + "matchPattern": "qdisc", + "matchCount": "0", + "teardown": [ + "$IP link del dev $DUMMY" + ] + } +] |