From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 29C08A0679 for ; Tue, 30 Apr 2019 19:02:27 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1FE7958CB; Tue, 30 Apr 2019 19:02:27 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id D18215F0D for ; Tue, 30 Apr 2019 19:02:25 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4159D58569; Tue, 30 Apr 2019 17:02:25 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-211.ams2.redhat.com [10.36.117.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA4536D0A2; Tue, 30 Apr 2019 17:02:23 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: David Marchand , Luca Boccassi , dpdk stable Date: Tue, 30 Apr 2019 18:01:20 +0100 Message-Id: <20190430170133.2331-25-ktraynor@redhat.com> In-Reply-To: <20190430170133.2331-1-ktraynor@redhat.com> References: <20190430170133.2331-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 30 Apr 2019 17:02:25 +0000 (UTC) Subject: [dpdk-stable] patch 'examples/l2fwd-cat: fix build on FreeBSD' has been queued to LTS release 18.11.2 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 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/07/19. 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 can be viewed on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From f9549d04f31dd902fbcc4787d6a1aee988318294 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 a6081e676..502c6b327 100644 --- a/examples/l2fwd-cat/cat.c +++ b/examples/l2fwd-cat/cat.c @@ -346,5 +346,5 @@ 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.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-30 17:58:15.005547351 +0100 +++ 0025-examples-l2fwd-cat-fix-build-on-FreeBSD.patch 2019-04-30 17:58:13.801139902 +0100 @@ -1 +1 @@ -From d51e5ec7b1a52e841f006794a2451266c3209b50 Mon Sep 17 00:00:00 2001 +From f9549d04f31dd902fbcc4787d6a1aee988318294 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d51e5ec7b1a52e841f006794a2451266c3209b50 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org