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

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to LTS release 17.11.10

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/21/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.

Thanks.

Luca Boccassi

---
>From 33fe8e8a0ddba6eb58ac527eb70edb95cc9a9060 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_ether/rte_eth_ctrl.h | 2 +-
 lib/librte_ether/rte_ethdev.c   | 2 +-
 lib/librte_ether/rte_ethdev.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/librte_ether/rte_eth_ctrl.h b/lib/librte_ether/rte_eth_ctrl.h
index 8386904243..c1c97bd638 100644
--- a/lib/librte_ether/rte_eth_ctrl.h
+++ b/lib/librte_ether/rte_eth_ctrl.h
@@ -36,7 +36,7 @@
 
 #include <stdint.h>
 #include <rte_common.h>
-#include "rte_ether.h"
+#include <rte_ether.h>
 
 /**
  * @file
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 7998a3af4d..d8595ab34a 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -63,8 +63,8 @@
 #include <rte_errno.h>
 #include <rte_spinlock.h>
 #include <rte_string_fns.h>
+#include <rte_ether.h>
 
-#include "rte_ether.h"
 #include "rte_ethdev.h"
 #include "ethdev_profile.h"
 
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 0d56cde76d..16a150842e 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -182,8 +182,8 @@ extern "C" {
 #include <rte_errno.h>
 #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.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:29.588454409 +0000
+++ 0081-ethdev-fix-include-of-ethernet-header-file.patch	2019-12-19 14:32:26.197299650 +0000
@@ -1,8 +1,10 @@
-From 22a076367369a04391a7b16d60a2905cf5c1da46 Mon Sep 17 00:00:00 2001
+From 33fe8e8a0ddba6eb58ac527eb70edb95cc9a9060 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.
 
@@ -10,57 +12,56 @@
 pre-designated by the compiler.
 
 Fixes: 57668ed7bc08 ("net: move ethernet definitions to the net library")
-Cc: stable at dpdk.org
 
 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 +-
+ lib/librte_ether/rte_eth_ctrl.h | 2 +-
+ lib/librte_ether/rte_ethdev.c   | 2 +-
+ lib/librte_ether/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 be4b4af65b..1416c371fb 100644
---- a/lib/librte_ethdev/rte_eth_ctrl.h
-+++ b/lib/librte_ethdev/rte_eth_ctrl.h
-@@ -7,7 +7,7 @@
+diff --git a/lib/librte_ether/rte_eth_ctrl.h b/lib/librte_ether/rte_eth_ctrl.h
+index 8386904243..c1c97bd638 100644
+--- a/lib/librte_ether/rte_eth_ctrl.h
++++ b/lib/librte_ether/rte_eth_ctrl.h
+@@ -36,7 +36,7 @@
  
  #include <stdint.h>
  #include <rte_common.h>
 -#include "rte_ether.h"
 +#include <rte_ether.h>
- #include "rte_flow.h"
  
  /**
-diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
-index 78da293979..7743205d38 100644
---- a/lib/librte_ethdev/rte_ethdev.c
-+++ b/lib/librte_ethdev/rte_ethdev.c
-@@ -37,8 +37,8 @@
+  * @file
+diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
+index 7998a3af4d..d8595ab34a 100644
+--- a/lib/librte_ether/rte_ethdev.c
++++ b/lib/librte_ether/rte_ethdev.c
+@@ -63,8 +63,8 @@
+ #include <rte_errno.h>
+ #include <rte_spinlock.h>
  #include <rte_string_fns.h>
- #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"
  #include "ethdev_profile.h"
-diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
-index 33c528bb8e..c36c1b631f 100644
---- a/lib/librte_ethdev/rte_ethdev.h
-+++ b/lib/librte_ethdev/rte_ethdev.h
-@@ -156,8 +156,8 @@ extern "C" {
+ 
+diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
+index 0d56cde76d..16a150842e 100644
+--- a/lib/librte_ether/rte_ethdev.h
++++ b/lib/librte_ether/rte_ethdev.h
+@@ -182,8 +182,8 @@ extern "C" {
  #include <rte_errno.h>
  #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"
  
- extern int rte_eth_dev_logtype;
 -- 
 2.20.1