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 7FE41A00BE for ; Tue, 15 Mar 2022 14:32:40 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7B4494014F; Tue, 15 Mar 2022 14:32:40 +0100 (CET) Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by mails.dpdk.org (Postfix) with ESMTP id 331974068C for ; Tue, 15 Mar 2022 14:32:39 +0100 (CET) Received: by mail-ej1-f44.google.com with SMTP id qx21so41281456ejb.13 for ; Tue, 15 Mar 2022 06:32:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6mOgEI56AelxlHcAgfAItSQ1XpVIHg1lf00JOmhfGaU=; b=cGzfrGoeIjfbYXB+bIDVHI+NdZdIV805zsBRenbMZ6d9IxMe3m9mpSyS9Rwy/05Vis MFG+C5ZNE696fJJiLwtKvLbsS34nJvRfo9NFVzK3sc360+y2zbrwUneq12EhsvUvD7pq sbWeBoMtRyNhLHpmJTbKXDW2tjcbWh1/ybI0L0Yub+HkL2J5P7wHWdWQgNfjAKR+p/r3 6UYWjeZtfnCSOzsw/ygNwo2bwfqnoTb2W8ADZjoxcwLYMxHsyGSEfzXu+hN5wQ0dcvXQ 9GFl8aS9akltFhoP7hJ5Eg0hRHidlG+sDsfX1Ah/D2z4GYYGivweUSZSUwFyj5FyH6GC SuZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6mOgEI56AelxlHcAgfAItSQ1XpVIHg1lf00JOmhfGaU=; b=hUwT2Ud6cu0EzqgjspnmrwgnvhAD1znw8w8MldGFDYHwM407xIC6eyEX7IJ4G6Vy8H J+Hj6RJOe5tMQ2P5MDvEL2Dnm2oTZfi3mmddHQ655G9jmTYe0IALyYqz5mPWS5rvN0zU N8TPqhs2BIrTHrByjtkrAW4TKC/7AcdITOJYSXtJ4Jri+sk7EN60D/VUKk7D6CqVSdc3 L//mfy5UuijEpZkUs+cgbn+ijq/bkKSJ6LKYQkCsFvv9A5l0FIt3l+N4vjHC8DaqhZ2j DXL/hUr/a85pICCxTpq4deMrY36BYHcTGw+Hvu9K+fedUG7XORFGZvouIT4GPVIYpUMz VM6g== X-Gm-Message-State: AOAM532e9n0vhv/KO+4x+/0DUNLXTBnWUASAvGHOSPr1BLD0zX5xxT8G /T9UXF+iGzskLTo3yBk8RnU7WqoFmkw= X-Google-Smtp-Source: ABdhPJyxtc6pWNaYoozYSJBj2ln43iuNnnIhsEJh0zmSjmvyWdsAEM6G3f2tVX0zQomRETc+cv371Q== X-Received: by 2002:a17:907:7845:b0:6cd:f2f4:cf00 with SMTP id lb5-20020a170907784500b006cdf2f4cf00mr22105521ejc.388.1647351158834; Tue, 15 Mar 2022 06:32:38 -0700 (PDT) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id g16-20020a170906521000b006d58773e992sm8192388ejm.188.2022.03.15.06.32.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Mar 2022 06:32:38 -0700 (PDT) From: luca.boccassi@gmail.com 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 20.11.5 Date: Tue, 15 Mar 2022 13:32:27 +0000 Message-Id: <20220315133233.635559-4-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220315133233.635559-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> <20220315133233.635559-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.5 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/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/6fc2a8d4995a9cb8f6b5fae192c643e634910e6c Thanks. Luca Boccassi --- >From 6fc2a8d4995a9cb8f6b5fae192c643e634910e6c 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/librte_bpf/bpf_impl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/librte_bpf/bpf_impl.h b/lib/librte_bpf/bpf_impl.h index 03ba0ae112..8f5dd10212 100644 --- a/lib/librte_bpf/bpf_impl.h +++ b/lib/librte_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 @@ -51,4 +51,4 @@ bpf_size(uint32_t bpf_op_sz) } #endif -#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-15 12:13:39.235277359 +0000 +++ 0004-bpf-fix-build-with-some-libpcap-version-on-FreeBSD.patch 2022-03-15 12:13:39.056180722 +0000 @@ -1 +1 @@ -From 63f39a430a0a7a8b893ffbf88cd452dbc7b97c97 Mon Sep 17 00:00:00 2001 +From 6fc2a8d4995a9cb8f6b5fae192c643e634910e6c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 63f39a430a0a7a8b893ffbf88cd452dbc7b97c97 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ - lib/bpf/bpf_impl.h | 6 +++--- + lib/librte_bpf/bpf_impl.h | 6 +++--- @@ -28,4 +29,4 @@ -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 +diff --git a/lib/librte_bpf/bpf_impl.h b/lib/librte_bpf/bpf_impl.h +index 03ba0ae112..8f5dd10212 100644 +--- a/lib/librte_bpf/bpf_impl.h ++++ b/lib/librte_bpf/bpf_impl.h @@ -43,2 +44 @@ -@@ -43,4 +43,4 @@ bpf_size(uint32_t bpf_op_sz) - return 0; +@@ -51,4 +51,4 @@ bpf_size(uint32_t bpf_op_sz) @@ -45,0 +46 @@ + #endif