diff options
| author | Zoltan Kiss <zoltan.kiss@schaman.hu> | 2015-02-26 18:25:35 +0000 |
|---|---|---|
| committer | Venkatesh Vivekanandan <venkatesh.vivekanandan@linaro.org> | 2015-02-27 14:48:18 +0530 |
| commit | 66cd0d3c0d4f0aad4ba2c7640d976f22a7ca5f66 (patch) | |
| tree | baafe0d34e92c97258028c1164b7ef3c27cd4179 | |
| parent | 5312f8620f92a1daf0ad06ba5886d13194586ad3 (diff) | |
packet: Trivial compile fixes plus remove SCTP
Signed-off-by: Venkatesh Vivekanandan <venkatesh.vivekanandan@linaro.org>
Signed-off-by: Zoltan Kiss <zoltan.kiss@linaro.org>
| -rw-r--r-- | platform/linux-dpdk/odp_packet.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/platform/linux-dpdk/odp_packet.c b/platform/linux-dpdk/odp_packet.c index f9168808f..a400b1074 100644 --- a/platform/linux-dpdk/odp_packet.c +++ b/platform/linux-dpdk/odp_packet.c @@ -68,6 +68,8 @@ int odp_packet_reset(odp_packet_t pkt, uint32_t len ODP_UNUSED) pkt_hdr->l2_offset = (uint32_t) ODP_PACKET_OFFSET_INVALID; pkt_hdr->l3_offset = (uint32_t) ODP_PACKET_OFFSET_INVALID; pkt_hdr->l4_offset = (uint32_t) ODP_PACKET_OFFSET_INVALID; + + return 0; } odp_packet_t odp_packet_from_buffer(odp_buffer_t buf) @@ -136,8 +138,7 @@ void *odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len) struct rte_mbuf *mb = &(odp_packet_hdr(pkt)->buf_hdr.mb); *len = mb->pkt.data_len - offset; } - - return odp_packet_data(pkt) + offset; + return (void*)((char*)odp_packet_data(pkt) + offset); } uint32_t odp_packet_l2_offset(odp_packet_t pkt) @@ -151,6 +152,7 @@ int odp_packet_l2_offset_set(odp_packet_t pkt, uint32_t offset) if (odp_unlikely(offset == ODP_PACKET_OFFSET_INVALID)) return -1; odp_packet_hdr(pkt)->l2_offset = offset; + return 0; } void *odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) @@ -165,7 +167,7 @@ void *odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) *len = mb->pkt.data_len - offset; } - return odp_packet_data(pkt) + offset; + return (void*)((char*)odp_packet_data(pkt) + offset); } uint32_t odp_packet_l3_offset(odp_packet_t pkt) @@ -179,6 +181,7 @@ int odp_packet_l3_offset_set(odp_packet_t pkt, uint32_t offset) if (odp_unlikely(offset > mb->pkt.data_len)) return -1; odp_packet_hdr(pkt)->l3_offset = offset; + return 0; } void *odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) @@ -193,7 +196,7 @@ void *odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) *len = mb->pkt.data_len - offset; } - return odp_packet_data(pkt) + offset; + return (void*)((char*)odp_packet_data(pkt) + offset); } uint32_t odp_packet_l4_offset(odp_packet_t pkt) @@ -207,6 +210,7 @@ int odp_packet_l4_offset_set(odp_packet_t pkt, uint32_t offset) if (odp_unlikely(offset > mb->pkt.data_len)) return -1; odp_packet_hdr(pkt)->l4_offset = offset; + return 0; } /** @@ -301,11 +305,6 @@ void odp_packet_parse(odp_packet_t pkt, size_t len, size_t frame_offset) pkt_hdr->input_flags.l4 = 1; pkt_hdr->l4_offset = pkt_hdr->l3_offset + offset; break; - case ODPH_IPPROTO_SCTP: - pkt_hdr->input_flags.sctp = 1; - pkt_hdr->input_flags.l4 = 1; - pkt_hdr->l4_offset = pkt_hdr->l3_offset + offset; - break; case ODPH_IPPROTO_ICMP: pkt_hdr->input_flags.icmp = 1; pkt_hdr->input_flags.l4 = 1; |