| Message ID | 20170112121419.1529-1-bill.fischofer@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 12 January 2017 at 13:14, Bill Fischofer <bill.fischofer@linaro.org> wrote: > odp_packet_set_len() is only called from the classifier on paths for > which a dummy header may be used. Rather than setting a dummy reference > count to validate, it's simpler to just delete the assert. This resolves > Bug https://bugs.linaro.org/show_bug.cgi?id=2814 > > Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org> Reviewed-by: Christophe Milard <christophe.milard@linaro.org> > --- > platform/linux-generic/include/odp_packet_internal.h | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h > index 607560d..c5dc989 100644 > --- a/platform/linux-generic/include/odp_packet_internal.h > +++ b/platform/linux-generic/include/odp_packet_internal.h > @@ -324,8 +324,6 @@ static inline void packet_ref_count_set(odp_packet_hdr_t *pkt_hdr, uint32_t n) > > static inline void packet_set_len(odp_packet_hdr_t *pkt_hdr, uint32_t len) > { > - ODP_ASSERT(packet_ref_count(pkt_hdr) == 1); > - > pkt_hdr->frame_len = len; > pkt_hdr->unshared_len = len; > } > -- > 2.9.3 >
Merged, Maxim. On 01/12/17 15:27, Christophe Milard wrote: > On 12 January 2017 at 13:14, Bill Fischofer <bill.fischofer@linaro.org> wrote: >> odp_packet_set_len() is only called from the classifier on paths for >> which a dummy header may be used. Rather than setting a dummy reference >> count to validate, it's simpler to just delete the assert. This resolves >> Bug https://bugs.linaro.org/show_bug.cgi?id=2814 >> >> Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org> > > Reviewed-by: Christophe Milard <christophe.milard@linaro.org> > >> --- >> platform/linux-generic/include/odp_packet_internal.h | 2 -- >> 1 file changed, 2 deletions(-) >> >> diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h >> index 607560d..c5dc989 100644 >> --- a/platform/linux-generic/include/odp_packet_internal.h >> +++ b/platform/linux-generic/include/odp_packet_internal.h >> @@ -324,8 +324,6 @@ static inline void packet_ref_count_set(odp_packet_hdr_t *pkt_hdr, uint32_t n) >> >> static inline void packet_set_len(odp_packet_hdr_t *pkt_hdr, uint32_t len) >> { >> - ODP_ASSERT(packet_ref_count(pkt_hdr) == 1); >> - >> pkt_hdr->frame_len = len; >> pkt_hdr->unshared_len = len; >> } >> -- >> 2.9.3 >>
diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 607560d..c5dc989 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -324,8 +324,6 @@ static inline void packet_ref_count_set(odp_packet_hdr_t *pkt_hdr, uint32_t n) static inline void packet_set_len(odp_packet_hdr_t *pkt_hdr, uint32_t len) { - ODP_ASSERT(packet_ref_count(pkt_hdr) == 1); - pkt_hdr->frame_len = len; pkt_hdr->unshared_len = len; }
odp_packet_set_len() is only called from the classifier on paths for which a dummy header may be used. Rather than setting a dummy reference count to validate, it's simpler to just delete the assert. This resolves Bug https://bugs.linaro.org/show_bug.cgi?id=2814 Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org> --- platform/linux-generic/include/odp_packet_internal.h | 2 -- 1 file changed, 2 deletions(-) -- 2.9.3