patch 'bpf: fix build with some libpcap version on FreeBSD' has been queued to stable release 21.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/21/22. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/0a38dcb3de7be158eef9ca09c27ed556c3c7dc39

Thanks.

Kevin

---
>From 0a38dcb3de7be158eef9ca09c27ed556c3c7dc39 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
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 <david.marchand at redhat.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
---
 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
@@ -3,6 +3,6 @@
  */
 
-#ifndef _BPF_H_
-#define _BPF_H_
+#ifndef BPF_IMPL_H
+#define BPF_IMPL_H
 
 #include <rte_bpf.h>
@@ -44,3 +44,3 @@ bpf_size(uint32_t bpf_op_sz)
 }
 
-#endif /* _BPF_H_ */
+#endif /* BPF_IMPL_H */
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-16 15:14:12.411935936 +0000
+++ 0011-bpf-fix-build-with-some-libpcap-version-on-FreeBSD.patch	2022-03-16 15:14:12.109847607 +0000
@@ -1 +1 @@
-From 63f39a430a0a7a8b893ffbf88cd452dbc7b97c97 Mon Sep 17 00:00:00 2001
+From 0a38dcb3de7be158eef9ca09c27ed556c3c7dc39 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 63f39a430a0a7a8b893ffbf88cd452dbc7b97c97 ]
+
@@ -20 +21,0 @@
-Cc: stable at dpdk.org