diff options
author | Ingo Molnar <mingo@kernel.org> | 2025-03-03 23:05:45 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2025-03-03 23:05:45 +0300 |
commit | 1fff9f8730b00c39ec5055656e45ef69acd9409a (patch) | |
tree | 96fea59eb525c4e76ec0872ff74962c6f28fab8b /tools/testing/selftests/drivers/net/queues.py | |
parent | 604ea3e90b17f27928a64d86259c57710c254438 (diff) | |
parent | 7eb172143d5508b4da468ed59ee857c6e5e01da6 (diff) | |
download | linux-1fff9f8730b00c39ec5055656e45ef69acd9409a.tar.xz |
Merge tag 'v6.14-rc5' into x86/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/testing/selftests/drivers/net/queues.py')
-rwxr-xr-x | tools/testing/selftests/drivers/net/queues.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/testing/selftests/drivers/net/queues.py b/tools/testing/selftests/drivers/net/queues.py index 38303da957ee..8a518905a9f9 100755 --- a/tools/testing/selftests/drivers/net/queues.py +++ b/tools/testing/selftests/drivers/net/queues.py @@ -45,10 +45,9 @@ def addremove_queues(cfg, nl) -> None: netnl = EthtoolFamily() channels = netnl.channels_get({'header': {'dev-index': cfg.ifindex}}) - if channels['combined-count'] == 0: - rx_type = 'rx' - else: - rx_type = 'combined' + rx_type = 'rx' + if channels.get('combined-count', 0) > 0: + rx_type = 'combined' expected = curr_queues - 1 cmd(f"ethtool -L {cfg.dev['ifname']} {rx_type} {expected}", timeout=10) |