From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0ED16A046B for ; Tue, 23 Jul 2019 03:03:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0464D1BFA1; Tue, 23 Jul 2019 03:03:36 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id A81CD1BFAD for ; Tue, 23 Jul 2019 03:03:34 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:03:31 +0300 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x6N11Hg1026580; Tue, 23 Jul 2019 04:03:30 +0300 From: Yongseok Koh To: Bruce Richardson Cc: David Marchand , Luca Boccassi , dpdk stable Date: Mon, 22 Jul 2019 18:00:42 -0700 Message-Id: <20190723010115.6446-75-yskoh@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190723010115.6446-1-yskoh@mellanox.com> References: <20190723010115.6446-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/l2fwd-cat: fix build on FreeBSD' has been queued to LTS release 17.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 17.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 07/27/19. So please shout if anyone has objection. 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. Thanks. Yongseok --- >From f6bed6abddaa61038e03ba8137d55c4191ebb8d9 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 9 Apr 2019 11:55:38 +0100 Subject: [PATCH] examples/l2fwd-cat: fix build on FreeBSD [ upstream commit d51e5ec7b1a52e841f006794a2451266c3209b50 ] The definition of CPU_AND differs from Linux to BSD, so we need to use RTE_CPU_AND instead. Fixes: f6baccbc2b3b ("examples/l2fwd-cat: add sample application for PQoS CAT and CDP") Signed-off-by: Bruce Richardson Reviewed-by: David Marchand Acked-by: Luca Boccassi --- examples/l2fwd-cat/cat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/l2fwd-cat/cat.c b/examples/l2fwd-cat/cat.c index 689dcb11f0..76400920ad 100644 --- a/examples/l2fwd-cat/cat.c +++ b/examples/l2fwd-cat/cat.c @@ -374,7 +374,7 @@ check_cpus_overlapping(void) for (i = 0; i < m_config_count; i++) { for (j = i + 1; j < m_config_count; j++) { - CPU_AND(&mask, + RTE_CPU_AND(&mask, &m_config[i].cpumask, &m_config[j].cpumask); -- 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-07-22 17:55:10.501271537 -0700 +++ 0075-examples-l2fwd-cat-fix-build-on-FreeBSD.patch 2019-07-22 17:55:06.264472000 -0700 @@ -1,13 +1,14 @@ -From d51e5ec7b1a52e841f006794a2451266c3209b50 Mon Sep 17 00:00:00 2001 +From f6bed6abddaa61038e03ba8137d55c4191ebb8d9 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 9 Apr 2019 11:55:38 +0100 Subject: [PATCH] examples/l2fwd-cat: fix build on FreeBSD +[ upstream commit d51e5ec7b1a52e841f006794a2451266c3209b50 ] + The definition of CPU_AND differs from Linux to BSD, so we need to use RTE_CPU_AND instead. Fixes: f6baccbc2b3b ("examples/l2fwd-cat: add sample application for PQoS CAT and CDP") -Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Reviewed-by: David Marchand @@ -17,10 +18,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/l2fwd-cat/cat.c b/examples/l2fwd-cat/cat.c -index a6081e6766..502c6b3278 100644 +index 689dcb11f0..76400920ad 100644 --- a/examples/l2fwd-cat/cat.c +++ b/examples/l2fwd-cat/cat.c -@@ -345,7 +345,7 @@ check_cpus_overlapping(void) +@@ -374,7 +374,7 @@ check_cpus_overlapping(void) for (i = 0; i < m_config_count; i++) { for (j = i + 1; j < m_config_count; j++) {