[dpdk-stable] [PATCH] ethdev: fix include for ether header file

[dpdk-stable] [PATCH] ethdev: fix include for ether header file

[Ciara Power]

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")
Cc: olivier.matz@6wind.com
Cc: stable@dpdk.org

Signed-off-by: Ciara Power <ciara.power@intel.com>
---
 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 be4b4af65..1416c371f 100644
--- a/lib/librte_ethdev/rte_eth_ctrl.h
+++ b/lib/librte_ethdev/rte_eth_ctrl.h
@@ -7,7 +7,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 af823607c..7445edc57 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -37,8 +37,8 @@
 #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 d937fb429..20c092e4f 100644
--- a/lib/librte_ethdev/rte_ethdev.h
+++ b/lib/librte_ethdev/rte_ethdev.h
@@ -156,8 +156,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_dev_info.h"
 
 extern int rte_eth_dev_logtype;
-- 
2.17.1

Re: [dpdk-stable] [PATCH] ethdev: fix include for ether header file

[Thomas Monjalon]

23/10/2019 14:53, Ciara Power:
> 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")
> Cc: olivier.matz@6wind.com
> Cc: stable@dpdk.org
> 
> Signed-off-by: Ciara Power <ciara.power@intel.com>
> ---
>  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(-)

Good change.
Acked-by: Thomas Monjalon <thomas@monjalon.net>

I'm curious, is it triggering any compilation issue?

Re: [dpdk-stable] [PATCH] ethdev: fix include for ether header file

[Power, Ciara]

> -----Original Message-----
> From: Thomas Monjalon <thomas@monjalon.net>
> Sent: Wednesday 23 October 2019 15:02
> To: Power, Ciara <ciara.power@intel.com>
> Cc: Yigit, Ferruh <ferruh.yigit@intel.com>; arybchenko@solarflare.com;
> dev@dpdk.org; olivier.matz@6wind.com; stable@dpdk.org
> Subject: Re: [PATCH] ethdev: fix include for ether header file
> 
> 23/10/2019 14:53, Ciara Power:
> > 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")
> > Cc: olivier.matz@6wind.com
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Ciara Power <ciara.power@intel.com>
> > ---
> >  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(-)
> 
> Good change.
> Acked-by: Thomas Monjalon <thomas@monjalon.net>
> 
> I'm curious, is it triggering any compilation issue?
> 

Hi Thomas,

No not that I'm aware, it's not triggering issues on our internal CI builds, and I haven't seen any issues using meson or make.

Re: [dpdk-stable] [PATCH] ethdev: fix include for ether header file

[Ferruh Yigit]

On 10/23/2019 3:01 PM, Thomas Monjalon wrote:
> 23/10/2019 14:53, Ciara Power:
>> 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")
>> Cc: olivier.matz@6wind.com
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Ciara Power <ciara.power@intel.com>
>> ---
>>  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(-)
> 
> Good change.
> Acked-by: Thomas Monjalon <thomas@monjalon.net>

Applied to dpdk-next-net/master, thanks.