Skip to content

Commit

Permalink
selftests/bpf: Fix merge conflict due to SYS() macro change.
Browse files Browse the repository at this point in the history
Fix merge conflict between bpf/bpf-next trees due to change of arguments in SYS() macro.

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
  • Loading branch information
Alexei Starovoitov committed Apr 14, 2023
1 parent c2865b1 commit c04135a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ void test_xdp_do_redirect(void)
goto out;

/* Enable GRO */
SYS("ethtool -K veth_src gro on");
SYS("ethtool -K veth_dst gro on");
SYS(out, "ethtool -K veth_src gro on");
SYS(out, "ethtool -K veth_dst gro on");

err = bpf_xdp_query(ifindex_src, XDP_FLAGS_DRV_MODE, &query_opts);
if (!ASSERT_OK(err, "veth_src bpf_xdp_query gro on"))
Expand Down

0 comments on commit c04135a

Please sign in to comment.