diff mbox series

[API-NEXT,06/15] merge fix: odp_packet_internal.h

Message ID 20170127142921.29029-7-maxim.uvarov@linaro.org
State New
Headers show
Series Merge tag 'v1.13.0.0' into api-next | expand

Commit Message

Maxim Uvarov Jan. 27, 2017, 2:29 p.m. UTC 
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

---
 .../linux-generic/include/odp_packet_internal.h    | 25 ----------------------
 1 file changed, 25 deletions(-)

-- 
2.11.0.295.gd7dffce
diff mbox series

Patch

diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h
index 9ba5b58b..c5dc989d 100644
--- a/platform/linux-generic/include/odp_packet_internal.h
+++ b/platform/linux-generic/include/odp_packet_internal.h
@@ -185,7 +185,6 @@  typedef struct odp_packet_hdr_t {
 	uint32_t headroom;
 	uint32_t tailroom;
 
-<<<<<<< HEAD
 	/* Fields used to support packet references */
 	uint32_t unshared_len;
 	struct odp_packet_hdr_t *ref_hdr;
@@ -206,21 +205,6 @@  typedef struct odp_packet_hdr_t {
 	/* Classifier destination queue */
 	odp_queue_t dst_queue;
 
-=======
-	/*
-	 * Members below are not initialized by packet_init()
-	 */
-
-	/* Flow hash value */
-	uint32_t flow_hash;
-
-	/* Timestamp value */
-	odp_time_t timestamp;
-
-	/* Classifier destination queue */
-	odp_queue_t dst_queue;
-
->>>>>>> v1.13.0.0
 	/* Result for crypto */
 	odp_crypto_generic_op_result_t op_result;
 
@@ -258,7 +242,6 @@  static inline odp_packet_hdr_t *odp_packet_last_hdr(odp_packet_t pkt,
 	return pkt_hdr;
 }
 
-<<<<<<< HEAD
 static inline odp_packet_hdr_t *odp_packet_prev_hdr(odp_packet_hdr_t *pkt_hdr,
 						    odp_packet_hdr_t *cur_hdr,
 						    uint32_t *offset)
@@ -304,15 +287,10 @@  static inline void copy_packet_cls_metadata(odp_packet_hdr_t *src_hdr,
 
 static inline void pull_tail(odp_packet_hdr_t *pkt_hdr, uint32_t len)
 {
-=======
-static inline void pull_tail(odp_packet_hdr_t *pkt_hdr, uint32_t len)
-{
->>>>>>> v1.13.0.0
 	int last = pkt_hdr->buf_hdr.segcount - 1;
 
 	pkt_hdr->tailroom  += len;
 	pkt_hdr->frame_len -= len;
-<<<<<<< HEAD
 	pkt_hdr->unshared_len -= len;
 	pkt_hdr->buf_hdr.seg[last].len -= len;
 }
@@ -337,9 +315,6 @@  static inline uint32_t packet_len(odp_packet_hdr_t *pkt_hdr)
 static inline uint32_t packet_ref_count(odp_packet_hdr_t *pkt_hdr)
 {
 	return odp_atomic_load_u32(&pkt_hdr->ref_count);
-=======
-	pkt_hdr->buf_hdr.seg[last].len -= len;
->>>>>>> v1.13.0.0
 }
 
 static inline void packet_ref_count_set(odp_packet_hdr_t *pkt_hdr, uint32_t n)