[dpdk-stable] patch 'examples/l2fwd-cat: fix build on FreeBSD' has been queued to LTS release 18.11.2

[Kevin Traynor]

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 <bruce.richardson at intel.com>
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 <bruce.richardson at intel.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
Acked-by: Luca Boccassi <bluca at debian.org>
---
 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 at dpdk.org