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 +- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src/framework/common') 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; } -- cgit 1.2.3-korg