[v5,1/4] security: use the net library for IP structs

Message ID 20211006223544.1882-2-u9012063@gmail.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series [v5,1/4] security: use the net library for IP structs |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

William Tu Oct. 6, 2021, 10:35 p.m. UTC
  From: Tal Shnaiderman <talshn@nvidia.com>

Remove the netinet includes and replaces them
with rte_ip.h to support the in_addr/in6_addr structs
on all operating systems.

Signed-off-by: Tal Shnaiderman <talshn@nvidia.com>
Acked-by: Akhil Goyal <gakhil@marvell.com>
Acked-by: William Tu <u9012063@gmail.com>
---
 lib/net/rte_ip.h            | 1 +
 lib/security/meson.build    | 2 +-
 lib/security/rte_security.h | 5 +----
 3 files changed, 3 insertions(+), 5 deletions(-)
  

Patch

diff --git a/lib/net/rte_ip.h b/lib/net/rte_ip.h
index 05948b69b7..bbd8650962 100644
--- a/lib/net/rte_ip.h
+++ b/lib/net/rte_ip.h
@@ -25,6 +25,7 @@ 
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netinet/ip.h>
+#include <netinet/ip6.h>
 #endif
 
 #include <rte_byteorder.h>
diff --git a/lib/security/meson.build b/lib/security/meson.build
index 5679c8b5c2..1034a7a299 100644
--- a/lib/security/meson.build
+++ b/lib/security/meson.build
@@ -3,4 +3,4 @@ 
 
 sources = files('rte_security.c')
 headers = files('rte_security.h', 'rte_security_driver.h')
-deps += ['mempool', 'cryptodev']
+deps += ['mempool', 'cryptodev', 'net']
diff --git a/lib/security/rte_security.h b/lib/security/rte_security.h
index a10c9b5f00..2013e65e49 100644
--- a/lib/security/rte_security.h
+++ b/lib/security/rte_security.h
@@ -19,13 +19,10 @@  extern "C" {
 
 #include <sys/types.h>
 
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/ip6.h>
-
 #include <rte_compat.h>
 #include <rte_common.h>
 #include <rte_crypto.h>
+#include <rte_ip.h>
 #include <rte_mbuf.h>
 #include <rte_mbuf_dyn.h>
 #include <rte_memory.h>