diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-09 15:47:47 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-09 15:47:47 +0100 |
| commit | 51b7e08afddaee38468d99dab8ced15c0f3874b1 (patch) | |
| tree | 533987b6a57e7352e645104cfb46a59eb60634de /tools/testing/selftests/bpf | |
| parent | 31ea129f8f7d75945c87957c0cd901429db07238 (diff) | |
| parent | fe3e786ef4eb6e47d2901f568a27bd920477bbe9 (diff) | |
| download | linux-next-51b7e08afddaee38468d99dab8ced15c0f3874b1.tar.gz linux-next-51b7e08afddaee38468d99dab8ced15c0f3874b1.zip | |
Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
# Conflicts:
# MAINTAINERS
# tools/testing/selftests/net/lib.sh
Diffstat (limited to 'tools/testing/selftests/bpf')
| -rw-r--r-- | tools/testing/selftests/bpf/prog_tests/test_xsk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/test_xsk.c b/tools/testing/selftests/bpf/prog_tests/test_xsk.c index 6eb9096d084c..477aedbb01ba 100644 --- a/tools/testing/selftests/bpf/prog_tests/test_xsk.c +++ b/tools/testing/selftests/bpf/prog_tests/test_xsk.c @@ -1164,8 +1164,8 @@ static int __send_pkts(struct ifobject *ifobject, struct xsk_socket_info *xsk, bool test_timeout) { u32 i, idx = 0, valid_pkts = 0, valid_frags = 0, buffer_len; + struct xsk_umem_info *umem = ifobject->xsk_arr[0].umem_real; struct pkt_stream *pkt_stream = xsk->pkt_stream; - struct xsk_umem_info *umem = xsk->umem; bool use_poll = ifobject->use_poll; struct pollfd fds = { }; int ret; @@ -1514,7 +1514,7 @@ static int thread_common_ops_tx(struct test_spec *test, struct ifobject *ifobjec umem_tx->base_addr = 0; umem_tx->next_buffer = 0; - ret = xsk_configure(test, ifobject, umem_tx, true); + ret = xsk_configure(test, ifobject, umem_rx, true); if (ret) return ret; ifobject->xsk = &ifobject->xsk_arr[0]; |