This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, master has been updated via bcb7aa8cb4e0fc0974cea7c92a488e0a6ba84c95 (commit) via 0b87221f657b4c88cba3011f350503ece92cfd1c (commit) via 008a34ae01a1980c4bfae5baf0c6df2bcd5820db (commit) via 9ffd1b9e2a3c10d7ba0e17689e5e1b823ecec393 (commit) via bbd5e76447bc586495cf79262314ec29ffe31540 (commit) via 54afd62e94e98fa8099c58c7d4deb54f563c52e7 (commit) via 5803effe1db1078189fc14d192943cd65b6a0d62 (commit) via 4bd301ee6b110282cf04ac581775ba9fd093d2d1 (commit) from 7c87b66edc84e8c713fefc68d46464660adaf71e (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit bcb7aa8cb4e0fc0974cea7c92a488e0a6ba84c95 Author: Matias Elo matias.elo@nokia.com Date: Thu Aug 9 10:40:50 2018 +0300
abi: timer: set ODP_TIMER_INVALID to zero
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Petri Savolainen petri.savolainen@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/odp/api/abi-default/timer.h b/include/odp/api/abi-default/timer.h index 2cf69d92..a7da8ff7 100644 --- a/include/odp/api/abi-default/timer.h +++ b/include/odp/api/abi-default/timer.h @@ -37,7 +37,7 @@ typedef struct timer_pool_s *odp_timer_pool_t;
typedef _odp_abi_timer_t *odp_timer_t;
-#define ODP_TIMER_INVALID ((odp_timer_t)0xffffffff) +#define ODP_TIMER_INVALID ((odp_timer_t)0)
typedef _odp_abi_timeout_t *odp_timeout_t;
diff --git a/platform/linux-generic/include-abi/odp/api/abi/timer.h b/platform/linux-generic/include-abi/odp/api/abi/timer.h index 9bc67e05..48138f72 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/timer.h +++ b/platform/linux-generic/include-abi/odp/api/abi/timer.h @@ -34,7 +34,7 @@ typedef struct timer_pool_s *odp_timer_pool_t;
typedef ODP_HANDLE_T(odp_timer_t);
-#define ODP_TIMER_INVALID _odp_cast_scalar(odp_timer_t, 0xffffffff) +#define ODP_TIMER_INVALID _odp_cast_scalar(odp_timer_t, 0)
typedef ODP_HANDLE_T(odp_timeout_t);
diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index a030036a..716571ca 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -231,7 +231,7 @@ static inline timer_pool_t *handle_to_tp(odp_timer_t hdl) static inline uint32_t handle_to_idx(odp_timer_t hdl, timer_pool_t *tp) { - uint32_t idx = _odp_typeval(hdl) & ((1U << INDEX_BITS) - 1U); + uint32_t idx = (_odp_typeval(hdl) & ((1U << INDEX_BITS) - 1U)) - 1; __builtin_prefetch(&tp->tick_buf[idx], 0, 0); if (odp_likely(idx < odp_atomic_load_u32(&tp->high_wm))) return idx; @@ -241,8 +241,9 @@ static inline uint32_t handle_to_idx(odp_timer_t hdl, static inline odp_timer_t tp_idx_to_handle(timer_pool_t *tp, uint32_t idx) { - ODP_ASSERT(idx < (1U << INDEX_BITS)); - return _odp_cast_scalar(odp_timer_t, (tp->tp_idx << INDEX_BITS) | idx); + ODP_ASSERT((idx + 1) < (1U << INDEX_BITS)); + return _odp_cast_scalar(odp_timer_t, (tp->tp_idx << INDEX_BITS) | + (idx + 1)); }
/* Forward declarations */
commit 0b87221f657b4c88cba3011f350503ece92cfd1c Author: Matias Elo matias.elo@nokia.com Date: Thu Aug 9 10:23:37 2018 +0300
abi: timer: set ODP_TIMEOUT_INVALID to zero
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Petri Savolainen petri.savolainen@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/odp/api/abi-default/timer.h b/include/odp/api/abi-default/timer.h index 76f3a5b9..2cf69d92 100644 --- a/include/odp/api/abi-default/timer.h +++ b/include/odp/api/abi-default/timer.h @@ -41,7 +41,7 @@ typedef _odp_abi_timer_t *odp_timer_t;
typedef _odp_abi_timeout_t *odp_timeout_t;
-#define ODP_TIMEOUT_INVALID ((odp_timeout_t)NULL) +#define ODP_TIMEOUT_INVALID ((odp_timeout_t)0)
/** * @} diff --git a/platform/linux-generic/include-abi/odp/api/abi/timer.h b/platform/linux-generic/include-abi/odp/api/abi/timer.h index c9e415ec..9bc67e05 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/timer.h +++ b/platform/linux-generic/include-abi/odp/api/abi/timer.h @@ -38,7 +38,7 @@ typedef ODP_HANDLE_T(odp_timer_t);
typedef ODP_HANDLE_T(odp_timeout_t);
-#define ODP_TIMEOUT_INVALID _odp_cast_scalar(odp_timeout_t, NULL) +#define ODP_TIMEOUT_INVALID _odp_cast_scalar(odp_timeout_t, 0)
/** * @}
commit 008a34ae01a1980c4bfae5baf0c6df2bcd5820db Author: Matias Elo matias.elo@nokia.com Date: Thu Aug 9 10:16:46 2018 +0300
abi: timer: set ODP_TIMER_POOL_INVALID to zero
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Petri Savolainen petri.savolainen@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/odp/api/abi-default/timer.h b/include/odp/api/abi-default/timer.h index 21a8961d..76f3a5b9 100644 --- a/include/odp/api/abi-default/timer.h +++ b/include/odp/api/abi-default/timer.h @@ -31,7 +31,7 @@ struct timer_pool_s; /**< Forward declaration */
typedef struct timer_pool_s *odp_timer_pool_t;
-#define ODP_TIMER_POOL_INVALID NULL +#define ODP_TIMER_POOL_INVALID ((odp_timer_pool_t)0)
#define ODP_TIMER_POOL_NAME_LEN 32
diff --git a/platform/linux-generic/include-abi/odp/api/abi/timer.h b/platform/linux-generic/include-abi/odp/api/abi/timer.h index 49752df7..c9e415ec 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/timer.h +++ b/platform/linux-generic/include-abi/odp/api/abi/timer.h @@ -28,7 +28,7 @@ struct timer_pool_s; /**< Forward declaration */
typedef struct timer_pool_s *odp_timer_pool_t;
-#define ODP_TIMER_POOL_INVALID NULL +#define ODP_TIMER_POOL_INVALID _odp_cast_scalar(odp_timer_pool_t, 0)
#define ODP_TIMER_POOL_NAME_LEN 32
commit 9ffd1b9e2a3c10d7ba0e17689e5e1b823ecec393 Author: Matias Elo matias.elo@nokia.com Date: Thu Aug 9 09:47:29 2018 +0300
abi: pool: set ODP_POOL_INVALID to zero
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Petri Savolainen petri.savolainen@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/odp/api/abi-default/pool.h b/include/odp/api/abi-default/pool.h index f3489ff9..4c67e309 100644 --- a/include/odp/api/abi-default/pool.h +++ b/include/odp/api/abi-default/pool.h @@ -22,7 +22,7 @@ typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_pool_t;
typedef _odp_abi_pool_t *odp_pool_t;
-#define ODP_POOL_INVALID ((odp_pool_t)0xffffffff) +#define ODP_POOL_INVALID ((odp_pool_t)0)
#define ODP_POOL_NAME_LEN 32
diff --git a/platform/linux-generic/include-abi/odp/api/abi/pool.h b/platform/linux-generic/include-abi/odp/api/abi/pool.h index cd161d5a..9ac1cf67 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/pool.h +++ b/platform/linux-generic/include-abi/odp/api/abi/pool.h @@ -27,7 +27,7 @@ extern "C" {
typedef ODP_HANDLE_T(odp_pool_t);
-#define ODP_POOL_INVALID _odp_cast_scalar(odp_pool_t, 0xffffffff) +#define ODP_POOL_INVALID _odp_cast_scalar(odp_pool_t, 0)
#define ODP_POOL_NAME_LEN 32
diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index e3de2b65..e8a04614 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -96,7 +96,7 @@ static inline pool_t *pool_entry(uint32_t pool_idx)
static inline pool_t *pool_entry_from_hdl(odp_pool_t pool_hdl) { - return &pool_tbl->pool[_odp_typeval(pool_hdl)]; + return &pool_tbl->pool[_odp_typeval(pool_hdl) - 1]; }
static inline odp_buffer_hdr_t *buf_hdl_to_hdr(odp_buffer_t buf) diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 01ee9234..7f5dfa8b 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -70,7 +70,7 @@ const _odp_pool_inline_offset_t ODP_ALIGNED_CACHE _odp_pool_inline = {
static inline odp_pool_t pool_index_to_handle(uint32_t pool_idx) { - return _odp_cast_scalar(odp_pool_t, pool_idx); + return _odp_cast_scalar(odp_pool_t, pool_idx + 1); }
static inline pool_t *pool_from_buf(odp_buffer_t buf)
commit bbd5e76447bc586495cf79262314ec29ffe31540 Author: Matias Elo matias.elo@nokia.com Date: Thu Aug 9 09:32:09 2018 +0300
abi: ipsec: set ODP_IPSEC_SA_INVALID to zero
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Petri Savolainen petri.savolainen@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/odp/api/abi-default/ipsec.h b/include/odp/api/abi-default/ipsec.h index 7ec43372..2c95fd4f 100644 --- a/include/odp/api/abi-default/ipsec.h +++ b/include/odp/api/abi-default/ipsec.h @@ -28,7 +28,7 @@ typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_ipsec_sa_t;
typedef _odp_abi_ipsec_sa_t *odp_ipsec_sa_t;
-#define ODP_IPSEC_SA_INVALID ((odp_ipsec_sa_t)0xffffffff) +#define ODP_IPSEC_SA_INVALID ((odp_ipsec_sa_t)0)
/** * @} diff --git a/platform/linux-generic/include-abi/odp/api/abi/ipsec.h b/platform/linux-generic/include-abi/odp/api/abi/ipsec.h index b91da795..a04bb174 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/ipsec.h +++ b/platform/linux-generic/include-abi/odp/api/abi/ipsec.h @@ -26,7 +26,7 @@ extern "C" {
typedef ODP_HANDLE_T(odp_ipsec_sa_t);
-#define ODP_IPSEC_SA_INVALID _odp_cast_scalar(odp_ipsec_sa_t, 0xffffffff) +#define ODP_IPSEC_SA_INVALID _odp_cast_scalar(odp_ipsec_sa_t, 0)
/** * @} diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index 3b1686b8..11f37fd8 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -38,12 +38,12 @@ static inline ipsec_sa_t *ipsec_sa_entry(uint32_t ipsec_sa_idx)
static inline ipsec_sa_t *ipsec_sa_entry_from_hdl(odp_ipsec_sa_t ipsec_sa_hdl) { - return ipsec_sa_entry(_odp_typeval(ipsec_sa_hdl)); + return ipsec_sa_entry(_odp_typeval(ipsec_sa_hdl) - 1); }
static inline odp_ipsec_sa_t ipsec_sa_index_to_handle(uint32_t ipsec_sa_idx) { - return _odp_cast_scalar(odp_ipsec_sa_t, ipsec_sa_idx); + return _odp_cast_scalar(odp_ipsec_sa_t, ipsec_sa_idx + 1); }
int _odp_ipsec_sad_init_global(void)
commit 54afd62e94e98fa8099c58c7d4deb54f563c52e7 Author: Matias Elo matias.elo@nokia.com Date: Wed Aug 8 17:09:12 2018 +0300
abi: classification: set ODP_PMR_INVAL to zero
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Petri Savolainen petri.savolainen@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/odp/api/abi-default/classification.h b/include/odp/api/abi-default/classification.h index 2541f181..ef102731 100644 --- a/include/odp/api/abi-default/classification.h +++ b/include/odp/api/abi-default/classification.h @@ -25,7 +25,7 @@ typedef _odp_abi_cos_t *odp_cos_t; typedef _odp_abi_pmr_t *odp_pmr_t;
#define ODP_COS_INVALID ((odp_cos_t)0) -#define ODP_PMR_INVAL ((odp_pmr_t)~0) +#define ODP_PMR_INVAL ((odp_pmr_t)0)
#define ODP_COS_NAME_LEN 32
diff --git a/platform/linux-generic/include-abi/odp/api/abi/classification.h b/platform/linux-generic/include-abi/odp/api/abi/classification.h index ce686279..92b926cd 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/classification.h +++ b/platform/linux-generic/include-abi/odp/api/abi/classification.h @@ -27,7 +27,7 @@ typedef ODP_HANDLE_T(odp_cos_t); #define ODP_COS_INVALID _odp_cast_scalar(odp_cos_t, 0)
typedef ODP_HANDLE_T(odp_pmr_t); -#define ODP_PMR_INVAL _odp_cast_scalar(odp_pmr_t, ~0) +#define ODP_PMR_INVAL _odp_cast_scalar(odp_pmr_t, 0)
#define ODP_COS_NAME_LEN 32
diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index e74373e0..70e8def6 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -55,6 +55,16 @@ static inline odp_cos_t _odp_cos_from_ndx(uint32_t ndx) return _odp_cast_scalar(odp_cos_t, ndx + 1); }
+static inline uint32_t _odp_pmr_to_ndx(odp_pmr_t pmr) +{ + return _odp_typeval(pmr) - 1; +} + +static inline odp_pmr_t _odp_pmr_from_ndx(uint32_t ndx) +{ + return _odp_cast_scalar(odp_pmr_t, ndx + 1); +} + static cos_t *get_cos_entry_internal(odp_cos_t cos) { @@ -62,9 +72,9 @@ cos_t *get_cos_entry_internal(odp_cos_t cos) }
static -pmr_t *get_pmr_entry_internal(odp_pmr_t pmr_id) +pmr_t *get_pmr_entry_internal(odp_pmr_t pmr) { - return &pmr_tbl->pmr[_odp_typeval(pmr_id)]; + return &pmr_tbl->pmr[_odp_pmr_to_ndx(pmr)]; }
int odp_classification_init_global(void) @@ -110,8 +120,7 @@ int odp_classification_init_global(void) memset(pmr_tbl, 0, sizeof(pmr_tbl_t)); for (i = 0; i < CLS_PMR_MAX_ENTRY; i++) { /* init locks */ - pmr_t *pmr = - get_pmr_entry_internal(_odp_cast_scalar(odp_pmr_t, i)); + pmr_t *pmr = get_pmr_entry_internal(_odp_pmr_from_ndx(i)); LOCK_INIT(&pmr->s.lock); }
@@ -317,7 +326,7 @@ odp_pmr_t alloc_pmr(pmr_t **pmr) pmr_tbl->pmr[i].s.num_pmr = 0; *pmr = &pmr_tbl->pmr[i]; /* return as locked */ - return _odp_cast_scalar(odp_pmr_t, i); + return _odp_pmr_from_ndx(i); } UNLOCK(&pmr_tbl->pmr[i].s.lock); } @@ -338,14 +347,15 @@ cos_t *get_cos_entry(odp_cos_t cos) }
static -pmr_t *get_pmr_entry(odp_pmr_t pmr_id) +pmr_t *get_pmr_entry(odp_pmr_t pmr) { - if (_odp_typeval(pmr_id) >= CLS_PMR_MAX_ENTRY || - pmr_id == ODP_PMR_INVAL) + uint32_t pmr_id = _odp_pmr_to_ndx(pmr); + + if (pmr_id >= CLS_PMR_MAX_ENTRY || pmr == ODP_PMR_INVAL) return NULL; - if (pmr_tbl->pmr[_odp_typeval(pmr_id)].s.valid == 0) + if (pmr_tbl->pmr[pmr_id].s.valid == 0) return NULL; - return &pmr_tbl->pmr[_odp_typeval(pmr_id)]; + return &pmr_tbl->pmr[pmr_id]; }
int odp_cos_destroy(odp_cos_t cos_id)
commit 5803effe1db1078189fc14d192943cd65b6a0d62 Author: Matias Elo matias.elo@nokia.com Date: Wed Aug 8 16:01:48 2018 +0300
abi: classification: set ODP_COS_INVALID to zero
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Petri Savolainen petri.savolainen@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/odp/api/abi-default/classification.h b/include/odp/api/abi-default/classification.h index 67c26517..2541f181 100644 --- a/include/odp/api/abi-default/classification.h +++ b/include/odp/api/abi-default/classification.h @@ -24,7 +24,7 @@ typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_pmr_t; typedef _odp_abi_cos_t *odp_cos_t; typedef _odp_abi_pmr_t *odp_pmr_t;
-#define ODP_COS_INVALID ((odp_cos_t)~0) +#define ODP_COS_INVALID ((odp_cos_t)0) #define ODP_PMR_INVAL ((odp_pmr_t)~0)
#define ODP_COS_NAME_LEN 32 diff --git a/platform/linux-generic/include-abi/odp/api/abi/classification.h b/platform/linux-generic/include-abi/odp/api/abi/classification.h index 1266e3f1..ce686279 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/classification.h +++ b/platform/linux-generic/include-abi/odp/api/abi/classification.h @@ -24,7 +24,7 @@ extern "C" { */
typedef ODP_HANDLE_T(odp_cos_t); -#define ODP_COS_INVALID _odp_cast_scalar(odp_cos_t, ~0) +#define ODP_COS_INVALID _odp_cast_scalar(odp_cos_t, 0)
typedef ODP_HANDLE_T(odp_pmr_t); #define ODP_PMR_INVAL _odp_cast_scalar(odp_pmr_t, ~0) diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 6e493bcd..e74373e0 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -45,10 +45,20 @@ static const rss_key default_rss = { } };
+static inline uint32_t _odp_cos_to_ndx(odp_cos_t cos) +{ + return _odp_typeval(cos) - 1; +} + +static inline odp_cos_t _odp_cos_from_ndx(uint32_t ndx) +{ + return _odp_cast_scalar(odp_cos_t, ndx + 1); +} + static -cos_t *get_cos_entry_internal(odp_cos_t cos_id) +cos_t *get_cos_entry_internal(odp_cos_t cos) { - return &cos_tbl->cos_entry[_odp_typeval(cos_id)]; + return &cos_tbl->cos_entry[_odp_cos_to_ndx(cos)]; }
static @@ -80,8 +90,7 @@ int odp_classification_init_global(void) memset(cos_tbl, 0, sizeof(cos_tbl_t)); for (i = 0; i < CLS_COS_MAX_ENTRY; i++) { /* init locks */ - cos_t *cos = - get_cos_entry_internal(_odp_cast_scalar(odp_cos_t, i)); + cos_t *cos = get_cos_entry_internal(_odp_cos_from_ndx(i)); LOCK_INIT(&cos->s.lock); }
@@ -283,7 +292,7 @@ odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param) odp_atomic_init_u32(&cos->s.num_rule, 0); cos->s.index = i; UNLOCK(&cos->s.lock); - return _odp_cast_scalar(odp_cos_t, i); + return _odp_cos_from_ndx(i); } UNLOCK(&cos->s.lock); } @@ -317,14 +326,15 @@ odp_pmr_t alloc_pmr(pmr_t **pmr) }
static -cos_t *get_cos_entry(odp_cos_t cos_id) +cos_t *get_cos_entry(odp_cos_t cos) { - if (_odp_typeval(cos_id) >= CLS_COS_MAX_ENTRY || - cos_id == ODP_COS_INVALID) + uint32_t cos_id = _odp_cos_to_ndx(cos); + + if (cos_id >= CLS_COS_MAX_ENTRY || cos == ODP_COS_INVALID) return NULL; - if (cos_tbl->cos_entry[_odp_typeval(cos_id)].s.valid == 0) + if (cos_tbl->cos_entry[cos_id].s.valid == 0) return NULL; - return &cos_tbl->cos_entry[_odp_typeval(cos_id)]; + return &cos_tbl->cos_entry[cos_id]; }
static
commit 4bd301ee6b110282cf04ac581775ba9fd093d2d1 Author: Matias Elo matias.elo@nokia.com Date: Wed Aug 8 14:53:50 2018 +0300
abi: packet: set ODP_PACKET_SEG_INVALID to zero
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Petri Savolainen petri.savolainen@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/odp/api/abi-default/packet.h b/include/odp/api/abi-default/packet.h index 97c0d088..b5380b04 100644 --- a/include/odp/api/abi-default/packet.h +++ b/include/odp/api/abi-default/packet.h @@ -27,7 +27,7 @@ typedef _odp_abi_packet_t *odp_packet_t; typedef _odp_abi_packet_seg_t *odp_packet_seg_t;
#define ODP_PACKET_INVALID ((odp_packet_t)0) -#define ODP_PACKET_SEG_INVALID ((odp_packet_seg_t)0xffffffff) +#define ODP_PACKET_SEG_INVALID ((odp_packet_seg_t)0) #define ODP_PACKET_OFFSET_INVALID 0xffff
typedef uint8_t odp_proto_l2_type_t; diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index e2c32728..602d3344 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -85,12 +85,12 @@ extern const _odp_pool_inline_offset_t _odp_pool_inline; #include <odp/api/plat/strong_types.h> static inline uint32_t _odp_packet_seg_to_ndx(odp_packet_seg_t seg) { - return _odp_typeval(seg); + return _odp_typeval(seg) - 1; }
static inline odp_packet_seg_t _odp_packet_seg_from_ndx(uint32_t ndx) { - return _odp_cast_scalar(odp_packet_seg_t, ndx); + return _odp_cast_scalar(odp_packet_seg_t, ndx + 1); } #endif
-----------------------------------------------------------------------
Summary of changes: include/odp/api/abi-default/classification.h | 4 +- include/odp/api/abi-default/ipsec.h | 2 +- include/odp/api/abi-default/packet.h | 2 +- include/odp/api/abi-default/pool.h | 2 +- include/odp/api/abi-default/timer.h | 6 +-- .../include-abi/odp/api/abi/classification.h | 4 +- .../linux-generic/include-abi/odp/api/abi/ipsec.h | 2 +- .../linux-generic/include-abi/odp/api/abi/pool.h | 2 +- .../linux-generic/include-abi/odp/api/abi/timer.h | 6 +-- .../include/odp/api/plat/packet_inlines.h | 4 +- platform/linux-generic/include/odp_pool_internal.h | 2 +- platform/linux-generic/odp_classification.c | 60 ++++++++++++++-------- platform/linux-generic/odp_ipsec_sad.c | 4 +- platform/linux-generic/odp_pool.c | 2 +- platform/linux-generic/odp_timer.c | 7 +-- 15 files changed, 65 insertions(+), 44 deletions(-)
hooks/post-receive
-
git＠git-us.linaro.org