Commit c04135ab authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

selftests/bpf: Fix merge conflict due to SYS() macro change. 



Fix merge conflict between bpf/bpf-next trees due to change of arguments in SYS() macro.

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent c2865b11

tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c

+2 −2
Original line number Diff line number Diff line
@@ -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"))