From 0a38dcb3de7be158eef9ca09c27ed556c3c7dc39 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 10 Mar 2022 19:30:40 +0100 Subject: [PATCH] bpf: fix build with some libpcap version on FreeBSD [ upstream commit 63f39a430a0a7a8b893ffbf88cd452dbc7b97c97 ] This is something caught in UNH FreeBSD env. For some reason [1], the pcap/bpf.h header started to define _BPF_H_. It happens that the bpf_impl.h internal DPDK header uses this define as an internal guard. This triggers a build failure in bpf_convert.c which can't find RTE_BPF_LOG macro. Fix the include guard to use the filename and remove _. 1: https://github.com/the-tcpdump-group/libpcap/pull/1074 Fixes: 94972f35a02e ("bpf: add BPF loading and execution framework") Signed-off-by: David Marchand Acked-by: Stephen Hemminger --- lib/bpf/bpf_impl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bpf/bpf_impl.h b/lib/bpf/bpf_impl.h index 26d165ad5c..b4d8e87c6d 100644 --- a/lib/bpf/bpf_impl.h +++ b/lib/bpf/bpf_impl.h @@ -2,8 +2,8 @@ * Copyright(c) 2018 Intel Corporation */ -#ifndef _BPF_H_ -#define _BPF_H_ +#ifndef BPF_IMPL_H +#define BPF_IMPL_H #include #include @@ -43,4 +43,4 @@ bpf_size(uint32_t bpf_op_sz) return 0; } -#endif /* _BPF_H_ */ +#endif /* BPF_IMPL_H */