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 C869FA0032 for ; Wed, 16 Mar 2022 16:15:57 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C45AD41145; Wed, 16 Mar 2022 16:15:57 +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 047E04114A for ; Wed, 16 Mar 2022 16:15:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647443755; 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: in-reply-to:in-reply-to:references:references; bh=c8EmnWKwfhVVsj0XThf315T8F8jXv+2O50OsRtXFJxg=; b=CI5IN836MbADUxCJ7SgxgH3iZ1UeelSTe3/oPdeI02MyZEKKrrdKwxX3hRc9rcgeGgNfff lYfB6al08D3iwcHY5/e/qh4qRmxq2ifBmKtGKM8xC9izUyZtRJtdshxT4NdnJ0nHx01S3S sLrQV1LP3eQnbGu0v95iTWjGSAUgnsA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-304-BJrdAG8ROGqrYGQMQITxmw-1; Wed, 16 Mar 2022 11:15:50 -0400 X-MC-Unique: BJrdAG8ROGqrYGQMQITxmw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A3504101CC74; Wed, 16 Mar 2022 15:15:50 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id 828F94B8D43; Wed, 16 Mar 2022 15:15:49 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Stephen Hemminger , dpdk stable Subject: patch 'bpf: fix build with some libpcap version on FreeBSD' has been queued to stable release 21.11.1 Date: Wed, 16 Mar 2022 15:15:12 +0000 Message-Id: <20220316151524.1242199-11-ktraynor@redhat.com> In-Reply-To: <20220316151524.1242199-1-ktraynor@redhat.com> References: <20220316151524.1242199-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@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 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 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 @@ -3,6 +3,6 @@ */ -#ifndef _BPF_H_ -#define _BPF_H_ +#ifndef BPF_IMPL_H +#define BPF_IMPL_H #include @@ -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@dpdk.org