diff options
| author |   yalei wang <wylandrea@gmail.com> | 2018-07-18 07:59:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2018-07-18 07:59:13 +0000 |
| commit | bc4785071529bcfe5bac2aea852c283f4f47f8f8 (patch) | |
| tree | 3f1c26ca9517113955af0bfcbfdda945509e1e09 /src/framework/common | |
| parent | 52241f47567ae07efecaf14b76f3e16fa23d171c (diff) | |
| parent | 000ee67eeeaa9868a98c9d2d743db90357ba3fa0 (diff) | |
Merge "Update dpdk version from 16.04 to 18.02"
Diffstat (limited to 'src/framework/common')
| -rw-r--r-- | src/framework/common/include/types.h | 4 | ||||
| -rw-r--r-- | src/framework/common/mem_mgr/nsfw_res_mgr.c | 2 |
2 files changed, 1 insertions, 5 deletions
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; } |