[dpdk-stable] patch 'ethdev: fix include of ethernet header file' has been queued to LTS release 18.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/16/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/2b48c8332e97a0ddc9df044227653ecb3d467c3b

Thanks.

Kevin.

---
>From 2b48c8332e97a0ddc9df044227653ecb3d467c3b Mon Sep 17 00:00:00 2001
From: Ciara Power <ciara.power at intel.com>
Date: Wed, 23 Oct 2019 13:53:00 +0100
Subject: [PATCH] ethdev: fix include of ethernet header file

[ upstream commit 22a076367369a04391a7b16d60a2905cf5c1da46 ]

The include for rte_ether.h in each of these files should not use
quotes, as the header file is not in the librte_ethdev directory.

These are now updated to use <> symbols, to search directories
pre-designated by the compiler.

Fixes: 57668ed7bc08 ("net: move ethernet definitions to the net library")

Signed-off-by: Ciara Power <ciara.power at intel.com>
Acked-by: Thomas Monjalon <thomas at monjalon.net>
---
 lib/librte_ethdev/rte_eth_ctrl.h | 2 +-
 lib/librte_ethdev/rte_ethdev.c   | 2 +-
 lib/librte_ethdev/rte_ethdev.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/librte_ethdev/rte_eth_ctrl.h b/lib/librte_ethdev/rte_eth_ctrl.h
index 925a63f24..0263e5040 100644
--- a/lib/librte_ethdev/rte_eth_ctrl.h
+++ b/lib/librte_ethdev/rte_eth_ctrl.h
@@ -8,5 +8,5 @@
 #include <stdint.h>
 #include <rte_common.h>
-#include "rte_ether.h"
+#include <rte_ether.h>
 
 /**
diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 3c75d3c78..b3fce9b08 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -38,6 +38,6 @@
 #include <rte_kvargs.h>
 #include <rte_class.h>
+#include <rte_ether.h>
 
-#include "rte_ether.h"
 #include "rte_ethdev.h"
 #include "rte_ethdev_driver.h"
diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
index 5d447bc12..a9472af62 100644
--- a/lib/librte_ethdev/rte_ethdev.h
+++ b/lib/librte_ethdev/rte_ethdev.h
@@ -155,6 +155,6 @@ extern "C" {
 #include <rte_common.h>
 #include <rte_config.h>
+#include <rte_ether.h>
 
-#include "rte_ether.h"
 #include "rte_eth_ctrl.h"
 #include "rte_dev_info.h"
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-10 14:49:40.559020730 +0000
+++ 0022-ethdev-fix-include-of-ethernet-header-file.patch	2019-12-10 14:49:39.024458290 +0000
@@ -1 +1 @@
-From 22a076367369a04391a7b16d60a2905cf5c1da46 Mon Sep 17 00:00:00 2001
+From 2b48c8332e97a0ddc9df044227653ecb3d467c3b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 22a076367369a04391a7b16d60a2905cf5c1da46 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index be4b4af65..1416c371f 100644
+index 925a63f24..0263e5040 100644
@@ -32 +32,0 @@
- #include "rte_flow.h"
@@ -33,0 +34 @@
+ /**
@@ -35 +36 @@
-index 78da29397..7743205d3 100644
+index 3c75d3c78..b3fce9b08 100644
@@ -47 +48 @@
-index 33c528bb8..c36c1b631 100644
+index 5d447bc12..a9472af62 100644
@@ -50 +51 @@
-@@ -157,6 +157,6 @@ extern "C" {
+@@ -155,6 +155,6 @@ extern "C" {
@@ -55,0 +57 @@
+ #include "rte_eth_ctrl.h"
@@ -57 +58,0 @@
-