[02/15] kni: move header file from EAL
diff mbox series

Message ID 20201026052105.1561859-3-thomas@monjalon.net
State Superseded, archived
Delegated to: Thomas Monjalon
Headers show
Series
  • remove mbuf userdata
Related show

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Thomas Monjalon Oct. 26, 2020, 5:20 a.m. UTC
Since the kernel module is not part of EAL anymore,
there is no need to have the common KNI header file in EAL.
The file rte_kni_common.h is moved to librte_kni.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 kernel/linux/kni/meson.build                                  | 2 +-
 lib/librte_eal/linux/include/meson.build                      | 1 -
 lib/librte_kni/meson.build                                    | 2 +-
 lib/{librte_eal/linux/include => librte_kni}/rte_kni_common.h | 0
 4 files changed, 2 insertions(+), 3 deletions(-)
 rename lib/{librte_eal/linux/include => librte_kni}/rte_kni_common.h (100%)

Comments

Andrew Rybchenko Oct. 26, 2020, 2:25 p.m. UTC | #1
On 10/26/20 8:20 AM, Thomas Monjalon wrote:
> Since the kernel module is not part of EAL anymore,
> there is no need to have the common KNI header file in EAL.
> The file rte_kni_common.h is moved to librte_kni.
> 
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>

Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Bruce Richardson Oct. 27, 2020, 11:33 a.m. UTC | #2
On Mon, Oct 26, 2020 at 06:20:52AM +0100, Thomas Monjalon wrote:
> Since the kernel module is not part of EAL anymore,
> there is no need to have the common KNI header file in EAL.
> The file rte_kni_common.h is moved to librte_kni.
> 
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---
>  kernel/linux/kni/meson.build                                  | 2 +-
>  lib/librte_eal/linux/include/meson.build                      | 1 -
>  lib/librte_kni/meson.build                                    | 2 +-
>  lib/{librte_eal/linux/include => librte_kni}/rte_kni_common.h | 0
>  4 files changed, 2 insertions(+), 3 deletions(-)
>  rename lib/{librte_eal/linux/include => librte_kni}/rte_kni_common.h (100%)
> 
Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Patch
diff mbox series

diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build
index d696347f22..07e0c9dae7 100644
--- a/kernel/linux/kni/meson.build
+++ b/kernel/linux/kni/meson.build
@@ -18,7 +18,7 @@  custom_target('rte_kni',
 		'src=' + meson.current_source_dir(),
 		'MODULE_CFLAGS=-include ' + meson.source_root() + '/config/rte_config.h' +
 		' -I' + meson.source_root() + '/lib/librte_eal/include' +
-		' -I' + meson.source_root() + '/lib/librte_eal/linux/include' +
+		' -I' + meson.source_root() + '/lib/librte_kni' +
 		' -I' + meson.build_root() +
 		' -I' + meson.current_source_dir(),
 		'modules'],
diff --git a/lib/librte_eal/linux/include/meson.build b/lib/librte_eal/linux/include/meson.build
index 1241894b3c..7d18dd52f1 100644
--- a/lib/librte_eal/linux/include/meson.build
+++ b/lib/librte_eal/linux/include/meson.build
@@ -4,6 +4,5 @@ 
 includes += include_directories('.')
 
 headers += files(
-        'rte_kni_common.h',
         'rte_os.h',
 )
diff --git a/lib/librte_kni/meson.build b/lib/librte_kni/meson.build
index 963eae6fe0..ad598bb3d0 100644
--- a/lib/librte_kni/meson.build
+++ b/lib/librte_kni/meson.build
@@ -6,5 +6,5 @@  if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
 	reason = 'only supported on 64-bit linux'
 endif
 sources = files('rte_kni.c')
-headers = files('rte_kni.h')
+headers = files('rte_kni.h', 'rte_kni_common.h')
 deps += ['ethdev', 'pci']
diff --git a/lib/librte_eal/linux/include/rte_kni_common.h b/lib/librte_kni/rte_kni_common.h
similarity index 100%
rename from lib/librte_eal/linux/include/rte_kni_common.h
rename to lib/librte_kni/rte_kni_common.h