From 000ee67eeeaa9868a98c9d2d743db90357ba3fa0 Mon Sep 17 00:00:00 2001 From: rainbow_0206 Date: Wed, 4 Jul 2018 11:36:02 +0800 Subject: Update dpdk version from 16.04 to 18.02 Change-Id: Idebbee1d61211e1e800df82e0d474cf3ef099075 Signed-off-by: rainbow_0206 --- src/framework/common/include/types.h | 4 ---- src/framework/common/mem_mgr/nsfw_res_mgr.c | 2 +- src/framework/ipc/ps/nsfw_fd_timer.c | 2 ++ src/framework/ipc/ps/nsfw_ps_module.c | 1 + src/framework/lib_common_mem/common_func.c | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src/framework') diff --git a/src/framework/common/include/types.h b/src/framework/common/include/types.h index c7d013c..bd4d80b 100644 --- a/src/framework/common/include/types.h +++ b/src/framework/common/include/types.h @@ -58,10 +58,6 @@ typedef unsigned long long u64; #define NULL ((void *)0) #endif -#define container_of(ptr, type, member) ( \ - (type *)((char *)(ptr) - offsetof(type,member)) \ - ) - #define PRIMARY_ADDR typedef struct _nsfw_res diff --git a/src/framework/common/mem_mgr/nsfw_res_mgr.c b/src/framework/common/mem_mgr/nsfw_res_mgr.c index 2f676c9..c4d8010 100644 --- a/src/framework/common/mem_mgr/nsfw_res_mgr.c +++ b/src/framework/common/mem_mgr/nsfw_res_mgr.c @@ -176,7 +176,7 @@ nsfw_res_flash_data (nsfw_res_mgr_item_cfg * res_scn_item) (struct common_mem_mempool *) scn_cfg->data; if (NULL == ring) { - ring = mp->ring; + ring = mp->pool_data; if (NULL == ring) return FALSE; } diff --git a/src/framework/ipc/ps/nsfw_fd_timer.c b/src/framework/ipc/ps/nsfw_fd_timer.c index 8c73ec0..55d35cb 100644 --- a/src/framework/ipc/ps/nsfw_fd_timer.c +++ b/src/framework/ipc/ps/nsfw_fd_timer.c @@ -22,6 +22,8 @@ #include "types.h" #include "list.h" +#include "common_mem_common.h" + #include "nstack_securec.h" #include "nsfw_init.h" #include "nsfw_mgr_com_api.h" diff --git a/src/framework/ipc/ps/nsfw_ps_module.c b/src/framework/ipc/ps/nsfw_ps_module.c index 0a02e6c..e600bf7 100644 --- a/src/framework/ipc/ps/nsfw_ps_module.c +++ b/src/framework/ipc/ps/nsfw_ps_module.c @@ -39,6 +39,7 @@ #include #include #include +#include "common_mem_common.h" #ifdef __cplusplus /* *INDENT-OFF* */ diff --git a/src/framework/lib_common_mem/common_func.c b/src/framework/lib_common_mem/common_func.c index f68380f..0cf5b90 100644 --- a/src/framework/lib_common_mem/common_func.c +++ b/src/framework/lib_common_mem/common_func.c @@ -137,7 +137,7 @@ dmm_pktmbuf_pool_iterator (struct common_mem_mempool * mp, uint32_t start, } int32_t elm_size = mp->elt_size + mp->header_size + mp->trailer_size; - struct common_mem_mbuf *elm_mbuf = (struct common_mem_mbuf *) (mp->elt_va_start + start * elm_size + mp->header_size); /*lint !e647 */ + struct common_mem_mbuf *elm_mbuf = (struct common_mem_mbuf *) (STAILQ_FIRST(&mp->mem_list)->addr + start * elm_size + mp->header_size); /*lint !e647 */ uint32_t i; uint32_t mbuf_end = COMMON_MEM_MIN (end, mp->size) - start; -- cgit 1.2.3-korg