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 04397A0471 for ; Fri, 21 Jun 2019 18:51:44 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D43F01D55F; Fri, 21 Jun 2019 18:51:43 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 9D37E1D55F for ; Fri, 21 Jun 2019 18:51:42 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1319B81F01; Fri, 21 Jun 2019 16:51:42 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-77.ams2.redhat.com [10.36.117.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id D8DC860BE0; Fri, 21 Jun 2019 16:51:40 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Bruce Richardson , dpdk stable Date: Fri, 21 Jun 2019 17:46:10 +0100 Message-Id: <20190621164626.31219-26-ktraynor@redhat.com> In-Reply-To: <20190621164626.31219-1-ktraynor@redhat.com> References: <20190621164626.31219-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 21 Jun 2019 16:51:42 +0000 (UTC) Subject: [dpdk-stable] patch 'examples/multi_process: fix FreeBSD build' has been queued to LTS release 18.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/26/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 are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/815f68fe246d634b2486a68588935d768539a824 Thanks. Kevin Traynor --- >From 815f68fe246d634b2486a68588935d768539a824 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 5 Jun 2019 13:30:26 +0200 Subject: [PATCH] examples/multi_process: fix FreeBSD build [ upstream commit 996839793a2b6af80c29ffe55f4361ae23665e69 ] Caught on FreeBSD 12: /usr/include/netinet/ip.h:71:17: error: field 'ip_src' has incomplete type struct in_addr ip_src,ip_dst; /* source and dest address */ ^~~~~~ On FreeBSD, netinet/ip.h is not auto sufficient like on Linux. But actually, this header is not used in the example, just remove it. Fixes: 764bf26873b9 ("add FreeBSD support") Signed-off-by: David Marchand Tested-by: Bruce Richardson Acked-by: Bruce Richardson --- examples/multi_process/client_server_mp/mp_server/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/multi_process/client_server_mp/mp_server/main.c b/examples/multi_process/client_server_mp/mp_server/main.c index 0ddc63e92..98d675910 100644 --- a/examples/multi_process/client_server_mp/mp_server/main.c +++ b/examples/multi_process/client_server_mp/mp_server/main.c @@ -12,5 +12,4 @@ #include #include -#include #include -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-21 17:22:13.095022723 +0100 +++ 0026-examples-multi_process-fix-FreeBSD-build.patch 2019-06-21 17:22:11.735518853 +0100 @@ -1 +1 @@ -From 996839793a2b6af80c29ffe55f4361ae23665e69 Mon Sep 17 00:00:00 2001 +From 815f68fe246d634b2486a68588935d768539a824 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 996839793a2b6af80c29ffe55f4361ae23665e69 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 9a8e422d4..015053370 100644 +index 0ddc63e92..98d675910 100644