Merged to staging with patch name correction as Taras said.
Maxim.
On 12/16/2014 02:43 PM, Bill Fischofer wrote:
Change odp_buffer_pool_info() output to use ODP_SHM_INVALID instead of
ODP_SHM_NULL.
Signed-off-by: Bill Fischofer <[email protected]>
---
platform/linux-generic/include/api/odp_buffer_pool.h | 2 +-
platform/linux-generic/odp_buffer_pool.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/platform/linux-generic/include/api/odp_buffer_pool.h
b/platform/linux-generic/include/api/odp_buffer_pool.h
index 4da5f84..8380ac1 100644
--- a/platform/linux-generic/include/api/odp_buffer_pool.h
+++ b/platform/linux-generic/include/api/odp_buffer_pool.h
@@ -117,7 +117,7 @@ typedef struct odp_buffer_pool_info_t {
odp_shm_t shm; /**< handle of shared memory area
supplied by application to
contain buffer pool, or
- ODP_SHM_NULL if this pool is
+ ODP_SHM_INVALID if this pool is
managed by ODP */
odp_buffer_pool_param_t params; /**< pool parameters */
} odp_buffer_pool_info_t;
diff --git a/platform/linux-generic/odp_buffer_pool.c
b/platform/linux-generic/odp_buffer_pool.c
index 4c8b037..2d2aba2 100644
--- a/platform/linux-generic/odp_buffer_pool.c
+++ b/platform/linux-generic/odp_buffer_pool.c
@@ -401,7 +401,7 @@ int odp_buffer_pool_info(odp_buffer_pool_t pool_hdl,
info->name = pool->s.name;
info->shm = pool->s.flags.user_supplied_shm ?
- pool->s.pool_shm : ODP_SHM_NULL;
+ pool->s.pool_shm : ODP_SHM_INVALID;
info->params.buf_size = pool->s.params.buf_size;
info->params.buf_align = pool->s.params.buf_align;
info->params.num_bufs = pool->s.params.num_bufs;
_______________________________________________
lng-odp mailing list
[email protected]
http://lists.linaro.org/mailman/listinfo/lng-odp
