From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 59204A00BE for ; Thu, 10 Mar 2022 19:30:51 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 495964113F; Thu, 10 Mar 2022 19:30:51 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 932E44113E for ; Thu, 10 Mar 2022 19:30:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646937050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U4AeYcHpS8Hi+/F30MToXcfGsyH/aMW21X77q/D6z8s=; b=cTmqA1jmQIh+V6RAL7NKVCfm3Y+4jbjgkyrHGsIxnBl2NFUjcaHclOCdX5iw2VDlItKzIc bU/bXXEhEYYGGhFR0iXXBZoDGf47OAwirqTsA1nABz/EjKIrKrHR3+yBJyRwAsenI1ja3g xebmk2jdcV5n5saDM5T5N/c5c7pLhPo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-208-xAqSavF6OYueUSlbjIy9Cg-1; Thu, 10 Mar 2022 13:30:47 -0500 X-MC-Unique: xAqSavF6OYueUSlbjIy9Cg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 312E71854E2A; Thu, 10 Mar 2022 18:30:46 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.194.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8EBDA8BB25; Thu, 10 Mar 2022 18:30:44 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: blo@iol.unh.edu, stable@dpdk.org, Konstantin Ananyev , Ferruh Yigit Subject: [PATCH] bpf: fix build with some libpcap version on FreeBSD Date: Thu, 10 Mar 2022 19:30:40 +0100 Message-Id: <20220310183040.31724-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 --- 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 */ -- 2.23.0