diff options
author | Christian Poessinger <christian@poessinger.com> | 2022-10-16 22:02:53 +0200 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2022-10-16 22:03:53 +0200 |
commit | b147c020bae07cc58bd9ec96b781e79b732c102b (patch) | |
tree | 830dbe8fa1454292da2d745c4f66606fb07b22e2 /src/xdp | |
parent | 3978dd30e50ac94a8728e0b1f4e691e7a93a1d2f (diff) | |
download | vyos-1x-b147c020bae07cc58bd9ec96b781e79b732c102b.tar.gz vyos-1x-b147c020bae07cc58bd9ec96b781e79b732c102b.zip |
xdp: T4284: migrate to Debian libbpf
In order to properly retrieve JSON information in the Smoketests for the new
QoS implementation we need a recent (>6.0) version of iproute2. This requires
the libbpf-dev package and this small source-code change.
Diffstat (limited to 'src/xdp')
-rw-r--r-- | src/xdp/common/common.mk | 2 | ||||
-rw-r--r-- | src/xdp/common/common_user_bpf_xdp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/xdp/common/common.mk b/src/xdp/common/common.mk index ebe23a9ed..ffb86a65c 100644 --- a/src/xdp/common/common.mk +++ b/src/xdp/common/common.mk @@ -39,7 +39,7 @@ KERN_USER_H ?= $(wildcard common_kern_user.h) CFLAGS ?= -g -I../include/ BPF_CFLAGS ?= -I../include/ -LIBS = -l:libbpf.a -lelf $(USER_LIBS) +LIBS = -lbpf -lelf $(USER_LIBS) all: llvm-check $(USER_TARGETS) $(XDP_OBJ) $(COPY_LOADER) $(COPY_STATS) diff --git a/src/xdp/common/common_user_bpf_xdp.c b/src/xdp/common/common_user_bpf_xdp.c index e7ef77174..faf7f4f91 100644 --- a/src/xdp/common/common_user_bpf_xdp.c +++ b/src/xdp/common/common_user_bpf_xdp.c @@ -274,7 +274,7 @@ struct bpf_object *load_bpf_and_xdp_attach(struct config *cfg) exit(EXIT_FAIL_BPF); } - strncpy(cfg->progsec, bpf_program__title(bpf_prog, false), sizeof(cfg->progsec)); + strncpy(cfg->progsec, bpf_program__section_name(bpf_prog), sizeof(cfg->progsec)); prog_fd = bpf_program__fd(bpf_prog); if (prog_fd <= 0) { |