bpf: fix build with some libpcap version on FreeBSD
Checks
Commit Message
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")
Cc: stable@dpdk.org
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
lib/bpf/bpf_impl.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Comments
On Thu, 10 Mar 2022 19:30:40 +0100
David Marchand <david.marchand@redhat.com> wrote:
> 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")
> Cc: stable@dpdk.org
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
10/03/2022 19:54, Stephen Hemminger:
> On Thu, 10 Mar 2022 19:30:40 +0100
> David Marchand <david.marchand@redhat.com> wrote:
>
> > 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")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: David Marchand <david.marchand@redhat.com>
>
> Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Applied, thanks.
@@ -2,8 +2,8 @@
* Copyright(c) 2018 Intel Corporation
*/
-#ifndef _BPF_H_
-#define _BPF_H_
+#ifndef BPF_IMPL_H
+#define BPF_IMPL_H
#include <rte_bpf.h>
#include <sys/mman.h>
@@ -43,4 +43,4 @@ bpf_size(uint32_t bpf_op_sz)
return 0;
}
-#endif /* _BPF_H_ */
+#endif /* BPF_IMPL_H */